diff -r 2f35c2ae7de8 -r c5086f714631 client/js/renderer/scene.js --- a/client/js/renderer/scene.js Sun May 25 13:45:24 2014 +0900 +++ b/client/js/renderer/scene.js Wed Jun 04 12:36:17 2014 +0200 @@ -233,12 +233,12 @@ bindClick(".Rk-ZoomFit", "autoScale"); this.$.find(".Rk-ZoomSave").click( function() { // Save scale and offset point - _this.renkan.project.addView( { zoom_level:_this.scale, offset_x:_this.offset.x, offset_y:_this.offset.y } ); + _this.renkan.project.addView( { zoom_level:_this.scale, offset:_this.offset } ); }); this.$.find(".Rk-ZoomSetSaved").click( function() { var view = _this.renkan.project.get("views").last(); if(view){ - _this.setScale(view.get("zoom_level"), new paper.Point(view.get("offset_x"), view.get("offset_y"))); + _this.setScale(view.get("zoom_level"), new paper.Point(view.get("offset"))); } }); if(this.renkan.read_only && !isNaN(parseInt(this.renkan.options.default_view))){ @@ -660,8 +660,8 @@ var _scale = Math.min( (paper.view.size.width - 2 * this.renkan.options.autoscale_padding) / (_maxx - _minx), (paper.view.size.height - 2 * this.renkan.options.autoscale_padding) / (_maxy - _miny)); this.initialScale = _scale; // Override calculated scale if asked - if((typeof force_view !== "undefined") && parseFloat(force_view.zoom_level)>0 && parseFloat(force_view.offset_x)>0 && parseFloat(force_view.offset_y)>0){ - this.setScale(parseFloat(force_view.zoom_level), new paper.Point(parseFloat(force_view.offset_x), parseFloat(force_view.offset_y))); + if((typeof force_view !== "undefined") && parseFloat(force_view.zoom_level)>0 && parseFloat(force_view.offset.x)>0 && parseFloat(force_view.offset.y)>0){ + this.setScale(parseFloat(force_view.zoom_level), new paper.Point(parseFloat(force_view.offset.x), parseFloat(force_view.offset.y))); } else{ this.setScale(_scale, paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale)));