diff options
author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/ninja.reel/ninja.js | |
parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 0d355eaa..859268a0 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -191,9 +191,33 @@ exports.Ninja = Montage.create(Component, { | |||
191 | } | 191 | } |
192 | }, | 192 | }, |
193 | 193 | ||
194 | _workspaceMode: { | ||
195 | value: null | ||
196 | }, | ||
197 | |||
198 | workspaceMode: { | ||
199 | get: function() { | ||
200 | return this._workspaceMode; | ||
201 | }, | ||
202 | set: function(val) { | ||
203 | if(this._workspaceMode !== val ) { | ||
204 | if(this._workspaceMode !== null) { | ||
205 | document.body.classList.remove("ws-" + this._workspaceMode); | ||
206 | } | ||
207 | document.body.classList.add("ws-" + val); | ||
208 | this._workspaceMode = val; | ||
209 | } | ||
210 | } | ||
211 | }, | ||
212 | |||
213 | _isResizing: { | ||
214 | value: null | ||
215 | }, | ||
216 | |||
194 | _resizedHeight : { | 217 | _resizedHeight : { |
195 | value: 0 | 218 | value: 0 |
196 | }, | 219 | }, |
220 | |||
197 | _height: { | 221 | _height: { |
198 | value: null | 222 | value: null |
199 | }, | 223 | }, |
@@ -307,6 +331,7 @@ exports.Ninja = Montage.create(Component, { | |||
307 | 331 | ||
308 | prepareForDraw: { | 332 | prepareForDraw: { |
309 | value: function() { | 333 | value: function() { |
334 | this.workspaceMode = "default"; | ||
310 | console.log("Loading Ninja --> ", this.ninjaVersion); | 335 | console.log("Loading Ninja --> ", this.ninjaVersion); |
311 | 336 | ||
312 | this.application.ninja = this; | 337 | this.application.ninja = this; |