Binary file integ/iri/img/pattern-0.png has changed
Binary file integ/iri/img/pattern-1.png has changed
Binary file integ/iri/img/pattern-2.png has changed
--- a/integ/iri/js/iri-creation-cinecard.js Tue May 07 18:19:28 2013 +0200
+++ b/integ/iri/js/iri-creation-cinecard.js Mon May 13 15:39:20 2013 +0200
@@ -269,7 +269,12 @@
default_user_color: "#808080",
buttons_background: "#101010",
static_url: renkan_base,
- label_untitled_nodes: false
+ label_untitled_nodes: false,
+ show_node_editor_color: false,
+ show_node_editor_size: false,
+ show_node_editor_image: false,
+ show_node_editor_uri: false,
+ show_edge_editor_uri: false
});
var elementDropped = false;
--- a/integ/renkan/js/defaults.js Tue May 07 18:19:28 2013 +0200
+++ b/integ/renkan/js/defaults.js Mon May 13 15:39:20 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 */
--- a/integ/renkan/js/paper-renderer.js Tue May 07 18:19:28 2013 +0200
+++ b/integ/renkan/js/paper-renderer.js Mon May 13 15:39:20 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);
+ }
+ }
}
};