--- a/client/js/renderer/scene.js Tue Sep 22 15:14:10 2015 +0200
+++ b/client/js/renderer/scene.js Tue Sep 22 15:32:43 2015 +0200
@@ -291,7 +291,7 @@
var _thRedraw = _.throttle(function() {
_this.redraw();
},50);
-
+
this.addRepresentations("Node", this.renkan.project.get("nodes"));
this.addRepresentations("Edge", this.renkan.project.get("edges"));
this.renkan.project.on("change:title", function() {
@@ -377,10 +377,10 @@
el.text(_title);
}
});
-
+
//register router events
this.renkan.router.on("router", function(_params){
- _this.parameters(_params);
+ _this.setViewparameters(_params);
});
if (_renkan.options.size_bug_fix) {
@@ -687,7 +687,7 @@
var RendererType = requtils.getRenderer()[_type];
var _repr = new RendererType(this, _model);
this.representations.push(_repr);
- return _repr;
+ return _repr;
},
addRepresentations: function(_type, _collection) {
var _this = this;
@@ -1202,7 +1202,7 @@
filesaver(blob,fileNameToSaveAs);
},
- parameters: 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)));
@@ -1232,7 +1232,7 @@
} else{
this.view = this.addRepresentation("View", null);
this.view.params = params;
- this.view.init();
+ this.view.init();
}
}
if (!this.view){
@@ -1242,7 +1242,7 @@
//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));
+ this.highlightModel(this.renkan.project.get("nodes").get(_params.idNode));
}
},
validViewIndex: function(index){
@@ -1252,7 +1252,7 @@
if (_index < 0){
validIndex = this.renkan.project.get("views").length + _index;
} else {
- validIndex = _index;
+ validIndex = _index;
}
if (typeof this.renkan.project.get("views").at(_index) === 'undefined'){
validIndex = 0;