# HG changeset patch # User veltr # Date 1368451732 -7200 # Node ID 756cfa6570d2de3dceaae111424b5003af509b07 # Parent 009427475db27db5571327eeffe8bd32aa84cfae Setting element_delete_delay now shows remove confirm dialog diff -r 009427475db2 -r 756cfa6570d2 client/js/defaults.js --- a/client/js/defaults.js Mon May 06 15:14:29 2013 +0200 +++ b/client/js/defaults.js Mon May 13 15:28:52 2013 +0200 @@ -28,8 +28,9 @@ force_resize: false, allow_double_click: true, /* Allows Double Click to create a node on an empty background */ - element_delete_delay: 5000, - /* Delay between clicking on the bin on an element and really deleting it */ + element_delete_delay: 8000, + /* Delay between clicking on the bin on an element and really deleting it + Set to 0 for delete confirm */ autoscale_padding: 50, /* MINI-MAP OPTIONS */ diff -r 009427475db2 -r 756cfa6570d2 client/js/paper-renderer.js --- a/client/js/paper-renderer.js Mon May 06 15:14:29 2013 +0200 +++ b/client/js/paper-renderer.js Mon May 13 15:28:52 2013 +0200 @@ -1225,12 +1225,18 @@ this.renderer.is_dragging = false; this.renderer.removeRepresentationsOfType("editor"); if (this.renderer.isEditable()) { - var delid = Rkns.Utils.getUID("delete"); - this.renderer.delete_list.push({ - id: delid, - time: new Date().valueOf() + this.options.element_delete_delay - }); - this.source_representation.model.set("delete_scheduled", delid); + if (this.options.element_delete_delay) { + var delid = Rkns.Utils.getUID("delete"); + this.renderer.delete_list.push({ + id: delid, + time: new Date().valueOf() + this.options.element_delete_delay + }); + this.source_representation.model.set("delete_scheduled", delid); + } else { + if (confirm(this.renkan.translate('Do you really wish to remove node ') + '"' + this.source_representation.model.get("title") + '"?')) { + this.project.removeNode(this.source_representation.model); + } + } } }; @@ -1352,12 +1358,18 @@ this.renderer.is_dragging = false; this.renderer.removeRepresentationsOfType("editor"); if (this.renderer.isEditable()) { - var delid = Rkns.Utils.getUID("delete"); - this.renderer.delete_list.push({ - id: delid, - time: new Date().valueOf() + this.options.element_delete_delay - }); - this.source_representation.model.set("delete_scheduled", delid); + if (this.options.element_delete_delay) { + var delid = Rkns.Utils.getUID("delete"); + this.renderer.delete_list.push({ + id: delid, + time: new Date().valueOf() + this.options.element_delete_delay + }); + this.source_representation.model.set("delete_scheduled", delid); + } else { + if (confirm(this.renkan.translate('Do you really wish to remove edge ') + '"' + this.source_representation.model.get("title") + '"?')) { + this.project.removeEdge(this.source_representation.model); + } + } } };