Silently hide edges that go to no nodes
authorveltr
Tue, 14 May 2013 12:36:11 +0200
changeset 176 f3da1f26f949
parent 175 f636e2dcfb2c
child 177 d5219b039120
Silently hide edges that go to no nodes
client/js/defaults.js
client/js/paper-renderer.js
client/render-test.html
--- a/client/js/defaults.js	Tue May 14 12:15:15 2013 +0200
+++ b/client/js/defaults.js	Tue May 14 12:36:11 2013 +0200
@@ -28,7 +28,7 @@
     force_resize: false,
     allow_double_click: true,
         /* Allows Double Click to create a node on an empty background */
-    element_delete_delay: 5000,
+    element_delete_delay: 0,
         /* Delay between clicking on the bin on an element and really deleting it
            Set to 0 for delete confirm */
     autoscale_padding: 50,
--- a/client/js/paper-renderer.js	Tue May 14 12:15:15 2013 +0200
+++ b/client/js/paper-renderer.js	Tue May 14 12:36:11 2013 +0200
@@ -319,7 +319,7 @@
     if (!_dontRedrawEdges) {
         Rkns._.each(this.project.get("edges").filter(function (ed) { return ((ed.to === this.model) || (ed.from === this.model));}), function(edge, index, list){
             var repr = this.renderer.getRepresentationByModel(edge);
-            if(repr != null && typeof repr.from_representation.paper_coords !== "undefined" && typeof repr.to_representation.paper_coords !== "undefined") {
+            if (repr && typeof repr.from_representation !== "undefined" && typeof repr.from_representation.paper_coords !== "undefined" && typeof repr.to_representation !== "undefined" && typeof repr.to_representation.paper_coords !== "undefined") {
                 repr.redraw();
             }
         }, this);
@@ -329,7 +329,7 @@
 
 Rkns.Renderer.Node.prototype.showImage = function() {
     if (typeof this.renderer.image_cache[this.img] === "undefined") {
-        var _image = new Image()
+        var _image = new Image();
         this.renderer.image_cache[this.img] = _image;
         _image.src = this.img;
     } else {
@@ -630,6 +630,13 @@
     this.from_representation = this.renderer.getRepresentationByModel(this.model.get("from"));
     this.to_representation = this.renderer.getRepresentationByModel(this.model.get("to"));
     if (!this.from_representation || !this.to_representation) {
+/*
+    console.log(
+            "Error on edge " + this.model.get("id")
+            + " from " + (this.model.get("from") ? this.model.get("from").get("id") : "<null>")
+            + " to " + (this.model.get("to") ? this.model.get("to").get("id") : "<null>")
+    );
+*/
         return;
     }
     var _p0a = this.from_representation.paper_coords,
--- a/client/render-test.html	Tue May 14 12:15:15 2013 +0200
+++ b/client/render-test.html	Tue May 14 12:36:11 2013 +0200
@@ -26,8 +26,8 @@
             var _renkan;
             $(function() {
                 _renkan = new Rkns.Renkan({
-                    show_node_circles: false,
-                    clip_node_images: false,
+                    //show_node_circles: false,
+                    //clip_node_images: false,
                     bins: [
                     	{
                             title: "Projet Lignes de Temps",
@@ -69,7 +69,7 @@
                     node_fill_color: false
                 });
                 Rkns.jsonIO(_renkan, {
-                    url: "data/simple-persist.php"
+                    url: "data/renkan-caroline.json"
                 });
             });
         </script>