diff options
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 9 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 25 |
2 files changed, 34 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index beae59d9..a94d670c 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -358,6 +358,14 @@ | |||
358 | } | 358 | } |
359 | }, | 359 | }, |
360 | 360 | ||
361 | "objectsController" : { | ||
362 | "prototype": "js/controllers/objects-controller", | ||
363 | "bindings": { | ||
364 | "currentDocument": {"<-": "@documentList.selectedObjects.0"}, | ||
365 | "objects": {"<-": "@documentList.selectedObjects.0.model.mObjects"} | ||
366 | } | ||
367 | }, | ||
368 | |||
361 | "clipboardController": { | 369 | "clipboardController": { |
362 | "prototype": "js/controllers/clipboard-controller" | 370 | "prototype": "js/controllers/clipboard-controller" |
363 | }, | 371 | }, |
@@ -391,6 +399,7 @@ | |||
391 | "timeline": {"@": "timeline"}, | 399 | "timeline": {"@": "timeline"}, |
392 | "mainMenuController": {"@": "mainMenuController"}, | 400 | "mainMenuController": {"@": "mainMenuController"}, |
393 | "codeEditorController": {"@": "codeEditorController"}, | 401 | "codeEditorController": {"@": "codeEditorController"}, |
402 | "objectsController": {"@": "objectsController"}, | ||
394 | "rightPanelContainer": {"#": "rightPanelContainer" }, | 403 | "rightPanelContainer": {"#": "rightPanelContainer" }, |
395 | "panelSplitter": {"@": "splitter3"}, | 404 | "panelSplitter": {"@": "splitter3"}, |
396 | "timelineSplitter": {"@": "splitter4"}, | 405 | "timelineSplitter": {"@": "splitter4"}, |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 61cd2487..f1825b9a 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; |