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); + } + } } };