client/js/renderer/viewrepr.js
changeset 554 32c7378d1c28
parent 547 0ce3dcdf24f7
child 557 18c36f038e9f
--- a/client/js/renderer/viewrepr.js	Thu Sep 24 17:47:11 2015 +0200
+++ b/client/js/renderer/viewrepr.js	Tue Sep 29 18:47:11 2015 +0200
@@ -43,12 +43,6 @@
             bindClick(".Rk-ZoomSave", "saveView");
             
             this.$.find(".Rk-ZoomSetSaved").click( function() {
-                _this.model = _this.renkan.project.get("views").at(_this.renkan.project.get("views").length -1);
-                _this.params = {
-                        "zoom_level": _this.model.get("zoom_level"),
-                        "offset": _this.model.get("offset"),
-                        "hidden_nodes": _this.model.get("hidden_nodes")
-                };
                 _this.setScale(_this.params.zoom_level, new paper.Point(_this.params.offset));
                 _this.showNodes(false);
                 if (_this.options.hide_nodes){
@@ -77,17 +71,20 @@
         },
         initWithParams: function(){
             var _this = this;
-
-            _this.setScale(_this.params.zoom_level, new paper.Point(_this.params.offset));
             
-            if (_this.options.hide_nodes){
+            if (_this.options.views_parameters){
+                _this.setScale(_this.params.zoom_level, new paper.Point(_this.params.offset));                
+            } else {
+                this.autoScale();
+            }
+            
+            if (_this.options.hide_nodes && _this.options.views_nodes){
                 _this.hiddenNodes = (_this.params.hidden_nodes || []).concat();
                 _this.hideNodes();
+            } else {
+                _this.showNodes(false);
             }
 
-            if (_this.renkan.project.get("views").length === 0){
-                _this.saveView();
-            }
         },
         saveView: function(){
             var _this = this;
@@ -200,7 +197,7 @@
             this.renderer.redraw();
         },
         updateUrl: function(){
-            if(this.options.update_url){
+            if(this.options.url_parameters && this.options.update_url){
                 var result = {};
                 var parameters = Backbone.history.getFragment().split('?');
                 if (parameters.length > 1){