aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ToolBase.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/tools/ToolBase.js
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/tools/ToolBase.js')
-rwxr-xr-xjs/tools/ToolBase.js16
1 files changed, 8 insertions, 8 deletions
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index 678d03ac..f43b1b58 100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
@@ -89,9 +89,9 @@ exports.toolBase = Montage.create(Component, {
89 89
90 if(this._canOperateOnStage) { 90 if(this._canOperateOnStage) {
91 if(event.shiftKey) { 91 if(event.shiftKey) {
92 this.application.ninja.selectionController.shiftSelectElement(this.application.ninja.stage.GetElement(event)); 92 this.application.ninja.selectionController.shiftSelectElement(this.application.ninja.stage.getElement(event));
93 } else { 93 } else {
94 this.application.ninja.selectionController.selectElement(this.application.ninja.stage.GetElement(event)); 94 this.application.ninja.selectionController.selectElement(this.application.ninja.stage.getElement(event));
95 } 95 }
96 } 96 }
97 97
@@ -109,13 +109,13 @@ exports.toolBase = Montage.create(Component, {
109 value:function(event){ 109 value:function(event){
110 var upperBoundary ,previousZoomValue; 110 var upperBoundary ,previousZoomValue;
111 111
112 previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; 112 previousZoomValue = this.application.ninja.documentBar.zoomFactor;
113 upperBoundary = previousZoomValue *1.2 ; 113 upperBoundary = previousZoomValue *1.2 ;
114 114
115 if(upperBoundary > 2000) 115 if(upperBoundary > 2000)
116 this.application.Ninja._documentBarRef.zoomFactor = 2000; 116 this.application.ninja.documentBar.zoomFactor = 2000;
117 else 117 else
118 this.application.Ninja._documentBarRef.zoomFactor*= 1.2; 118 this.application.ninja.documentBar.zoomFactor*= 1.2;
119 119
120 } 120 }
121 }, 121 },
@@ -124,13 +124,13 @@ exports.toolBase = Montage.create(Component, {
124 value:function(){ 124 value:function(){
125 var lowerBoundary ,previousZoomValue; 125 var lowerBoundary ,previousZoomValue;
126 126
127 previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; 127 previousZoomValue = this.application.ninja.documentBar.zoomFactor ;
128 lowerBoundary = previousZoomValue/1.2 ; 128 lowerBoundary = previousZoomValue/1.2 ;
129 129
130 if(lowerBoundary < 25) 130 if(lowerBoundary < 25)
131 this.application.Ninja._documentBarRef.zoomFactor = 25; 131 this.application.ninja.documentBar.zoomFactor = 25;
132 else 132 else
133 this.application.Ninja._documentBarRef.zoomFactor/= 1.2; 133 this.application.ninja.documentBar.zoomFactor/= 1.2;
134 } 134 }
135 }, 135 },
136 136