diff options
author | Jon Reid | 2012-04-26 13:13:17 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-26 13:13:17 -0700 |
commit | ddbc1ac7eb35fee9254f4842fe29ab35de3d214c (patch) | |
tree | 3cfacd0f4714e929584e7bb915dfd3613fb74226 /js/tools/ToolBase.js | |
parent | 47e63e06fe01a1d66d3909b5f6acc0d987f97d9d (diff) | |
parent | 53eba0fe1bd27396a8b7cb7828e51457d8d9576a (diff) | |
download | ninja-ddbc1ac7eb35fee9254f4842fe29ab35de3d214c.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/tools/ToolBase.js')
-rwxr-xr-x | js/tools/ToolBase.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js index 678d03ac..69ac5727 100755 --- a/js/tools/ToolBase.js +++ b/js/tools/ToolBase.js | |||
@@ -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 | ||