diff -r 5e0746deaf0d -r fdff56da097d client/js/renderer/scene.js --- a/client/js/renderer/scene.js Tue Jul 26 18:24:33 2016 +0200 +++ b/client/js/renderer/scene.js Wed Jul 27 13:55:18 2016 +0200 @@ -320,7 +320,7 @@ this.addRepresentations("Node", this.renkan.project.get("nodes")); this.addRepresentations("Edge", this.renkan.project.get("edges")); this.renkan.project.on("change:title", function() { - _this.$.find(".Rk-PadTitle").val(_renkan.project.get("title")); + _this.$.find(".Rk-PadTitle").val(_renkan.project.get("title")).prop('title', _renkan.project.get("title")); }); this.$.find(".Rk-PadTitle").on("keyup input paste", function() { @@ -366,7 +366,7 @@ //register router events this.renkan.router.on("router", function(_params){ - _this.setViewparameters(_params); + _this.setViewParameters(_params); }); this.renkan.project.on("change:loadingStatus", function(){ @@ -474,15 +474,26 @@ _renkan.project.get("nodes").each(function(n) { _this.getRepresentationByModel(n).unhighlight(); }); + _renkan.project.get("edges").each(function(e) { + _this.getRepresentationByModel(e).unhighlight(); + }); } else { var rxs = Utils.regexpFromTextOrArray(val); _renkan.project.get("nodes").each(function(n) { - if (rxs.test(n.get("title")) || rxs.test(n.get("description"))) { + if (n.id === val || rxs.test(n.get("title")) || rxs.test(n.get("description"))) { _this.getRepresentationByModel(n).highlight(rxs); } else { _this.getRepresentationByModel(n).unhighlight(); } }); + _renkan.project.get("edges").each(function(e) { + if (e.id === val || rxs.test(e.get("title")) || rxs.test(e.get("description"))) { + _this.getRepresentationByModel(e).highlight(rxs); + } else { + _this.getRepresentationByModel(e).unhighlight(); + } + }); + } }); } @@ -1226,7 +1237,7 @@ filesaver(blob,fileNameToSaveAs); }, - setViewparameters: function(_params){ + setViewParameters: function(_params){ this.removeRepresentationsOfType("View"); if ($.isEmptyObject(_params)){ this.view = this.addRepresentation("View", this.renkan.project.get("views").at(this.validViewIndex(this.renkan.options.default_index_view))); @@ -1264,9 +1275,13 @@ } //other parameters must go after because most of them depends on a view that must be initialize before this.unhighlightAll(); - if (typeof _params.idNode !== 'undefined'){ - this.highlightModel(this.renkan.project.get("nodes").get(_params.idNode)); + if (typeof _params.node !== 'undefined' && _params.node){ + this.highlightModel(this.renkan.project.get("nodes").get(_params.node)); } + if (typeof _params.edge !== 'undefined' && _params.edge){ + this.highlightModel(this.renkan.project.get("edges").get(_params.edge)); + } + }, validViewIndex: function(index){ //check if the view index exist (negative index is from the end) and return the correct index or false if doesn't exist