client/js/paper-renderer.js
changeset 267 bec6bba21c2b
parent 266 19f87d783168
child 268 a9f9257cfcef
--- a/client/js/paper-renderer.js	Mon Feb 17 17:20:30 2014 +0100
+++ b/client/js/paper-renderer.js	Mon Feb 17 17:38:17 2014 +0100
@@ -1794,49 +1794,13 @@
     bindClick(".Rk-ZoomOut", "zoomOut");
     bindClick(".Rk-ZoomIn", "zoomIn");
     bindClick(".Rk-ZoomFit", "autoScale");
-    this.$.find(".Rk-ZoomSet").click( function() { _this.$.find(".Rk-ZoomSetContainer").toggle(); } );
-    this.$.find(".Rk-ZoomSlider").slider({
-    	orientation: "vertical",
-    	value:8,
-    	min: 1,
-    	max: 16,
-    	step: 1,
-    	slide: function( event, ui ) {
-    		_this.$.find(".Rk-ZoomSetValue").val( ui.value );
-    	},
-    	change: function( event, ui ) {
-    		_this.$.find(".Rk-ZoomSetValue").val( ui.value );
-    	},
-    	stop: function( event, ui ) {
-    		_this.$.find(".Rk-ZoomSetValue").val( ui.value );
-        	// Get value 
-        	var current_zoom = parseInt(_this.$.find(".Rk-ZoomSetValue").val()),
-        		nb_step = 0,
-        		mid_step = (_SCALE_STEPS/2),
-        		scale_factor = 1;
-        	if(current_zoom < mid_step){
-        		nb_step = mid_step - current_zoom;
-        		scale_factor = Math.SQRT1_2;
-        	}
-        	else if(current_zoom > mid_step){
-        		nb_step = current_zoom - mid_step;
-        		scale_factor = Math.SQRT2;
-        	}
-        	var _newScale = _this.initialScale;
-        	for(var i=0;i<nb_step;i++){
-        		_newScale = _newScale * scale_factor;
-        	}
-    		var _offset = new paper.Point([
-    		                           _this.canvas_$.width(),
-    		                           _this.canvas_$.height()
-    		                       ]).multiply( .5 * ( 1 - _newScale ) ).add(_this.offset.multiply( _newScale ));
-        	_this.setScale( _newScale, _offset );
-    	}
-    });
-    this.$.find(".Rk-ZoomSetButton").click( function() {
+    this.$.find(".Rk-ZoomSave").click( function() {
     	console.log("SAVE ZOOM FOR REAL", _this, _this.scale);
     	_this.renkan.project.set("zoom_level", _this.scale); // Save scale
-    	//_this.$.find(".Rk-ZoomSetContainer").toggle();
+    	_this.$.find(".Rk-ZoomSetSaved").show();
+    });
+    this.$.find(".Rk-ZoomSetSaved").click( function() {
+    	_this.setScale(_this.renkan.project.get("zoom_level"));
     });
     this.$.find(".Rk-CurrentUser").mouseenter(
         function() { _this.$.find(".Rk-UserList").slideDown(); }
@@ -2048,8 +2012,7 @@
     + '<div class="Rk-Labels"></div><canvas class="Rk-Canvas" resize></canvas><div class="Rk-Notifications"></div><div class="Rk-Editor">'
     + '<% if (options.show_bins) { %><div class="Rk-Fold-Bins">&laquo;</div><% } %>'
     + '<div class="Rk-ZoomButtons"><div class="Rk-ZoomIn" title="<%-translate("Zoom In")%>"></div><div class="Rk-ZoomFit" title="<%-translate("Zoom Fit")%>"></div><div class="Rk-ZoomOut" title="<%-translate("Zoom Out")%>"></div>'
-    + '<div class="Rk-ZoomSet" title="<%-translate("Zoom Set")%>"></div><div class="Rk-ZoomSetContainer"><div class="Rk-ZoomSlider"></div>'
-    + '<p><input type="text" class="Rk-ZoomSetValue" value="8" /><span class="Rk-ZoomSetButton ui-icon ui-icon-disk large" title="<%-translate("Save")%>"></span></p></div>'
+    + '<div class="Rk-ZoomSave" title="<%-translate("Zoom Save")%>"></div><div class="Rk-ZoomSetSaved" title="<%-translate("View saved zoom")%>"></div></div>'
     + '</div></div>'
 ),
 fixSize: function(_autoscale) {