aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-bar.reel/document-bar.js
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/layout/document-bar.reel/document-bar.js
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.js')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js32
1 files changed, 16 insertions, 16 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 86c55267..890640b1 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -127,21 +127,21 @@ exports.DocumentBar = Montage.create(Component, {
127 value: 100 127 value: 100
128 }, 128 },
129 129
130 zoomFactor: { 130 zoomFactor: {
131 get: function() { return this._zoomFactor; }, 131 get: function() { return this._zoomFactor; },
132 132
133 set: function(value) 133 set: function(value)
134 { 134 {
135 if(value !== this._zoomFactor) 135 if(value !== this._zoomFactor)
136 { 136 {
137 this._zoomFactor = value; 137 this._zoomFactor = value;
138 if (!this._firstDraw) 138 if (!this._firstDraw)
139 { 139 {
140 this.application.ninja.stage.setZoom(value); 140 this.application.ninja.stage.setZoom(value);
141 } 141 }
142 } 142 }
143 } 143 }
144 }, 144 },
145 145
146 draw: { 146 draw: {
147 value: function() { 147 value: function() {
@@ -157,7 +157,7 @@ exports.DocumentBar = Montage.create(Component, {
157 this.codeView.classList.add("selected"); 157 this.codeView.classList.add("selected");
158 if(this.designView.classList.contains("selected")) this.designView.classList.toggle("selected"); 158 if(this.designView.classList.contains("selected")) this.designView.classList.toggle("selected");
159 } 159 }
160 160
161 } else if(this.type) { 161 } else if(this.type) {
162 this.designView.classList.remove("active"); 162 this.designView.classList.remove("active");
163 } 163 }