diff options
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 8 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 23 |
2 files changed, 28 insertions, 3 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a98fca60..221e492c 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -360,6 +360,13 @@ | |||
360 | } | 360 | } |
361 | }, | 361 | }, |
362 | 362 | ||
363 | "objectsController" : { | ||
364 | "prototype": "js/controllers/objects-controller", | ||
365 | "bindings": { | ||
366 | "currentDocument": {"<-": "@owner.currentDocument"} | ||
367 | } | ||
368 | }, | ||
369 | |||
363 | "owner": { | 370 | "owner": { |
364 | "prototype": "js/ninja.reel", | 371 | "prototype": "js/ninja.reel", |
365 | "properties": { | 372 | "properties": { |
@@ -389,6 +396,7 @@ | |||
389 | "timeline": {"@": "timeline"}, | 396 | "timeline": {"@": "timeline"}, |
390 | "mainMenuController": {"@": "mainMenuController"}, | 397 | "mainMenuController": {"@": "mainMenuController"}, |
391 | "codeEditorController": {"@": "codeEditorController"}, | 398 | "codeEditorController": {"@": "codeEditorController"}, |
399 | "objectsController": {"@": "objectsController"}, | ||
392 | "rightPanelContainer": {"#": "rightPanelContainer" }, | 400 | "rightPanelContainer": {"#": "rightPanelContainer" }, |
393 | "panelSplitter": {"@": "splitter3"}, | 401 | "panelSplitter": {"@": "splitter3"}, |
394 | "timelineSplitter": {"@": "splitter4"}, | 402 | "timelineSplitter": {"@": "splitter4"}, |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 38f5efcf..5f753bd3 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -23,9 +23,6 @@ exports.Ninja = Montage.create(Component, { | |||
23 | value: null | 23 | value: null |
24 | }, | 24 | }, |
25 | 25 | ||
26 | appData: { | ||
27 | value: AppData | ||
28 | }, | ||
29 | 26 | ||
30 | documentList: { | 27 | documentList: { |
31 | value: null | 28 | value: null |
@@ -41,6 +38,25 @@ exports.Ninja = Montage.create(Component, { | |||
41 | } | 38 | } |
42 | }, | 39 | }, |
43 | 40 | ||
41 | _workspaceMode: { | ||
42 | value: null | ||
43 | }, | ||
44 | |||
45 | workspaceMode: { | ||
46 | get: function() { | ||
47 | return this.workspaceMode; | ||
48 | }, | ||
49 | set: function(val) { | ||
50 | if(this._workspaceMode !== val ) { | ||
51 | if(this._workspaceMode !== null) { | ||
52 | document.body.classList.remove("ws-" + this._workspaceMode); | ||
53 | } | ||
54 | document.body.classList.add("ws-" + val); | ||
55 | this._workspaceMode = val; | ||
56 | } | ||
57 | } | ||
58 | }, | ||
59 | |||
44 | _resizedHeight : { | 60 | _resizedHeight : { |
45 | value: 0 | 61 | value: 0 |
46 | }, | 62 | }, |
@@ -172,6 +188,7 @@ exports.Ninja = Montage.create(Component, { | |||
172 | 188 | ||
173 | prepareForDraw: { | 189 | prepareForDraw: { |
174 | value: function() { | 190 | value: function() { |
191 | this.workspaceMode = "default"; | ||
175 | console.log("Loading Ninja --> ", this.ninjaVersion); | 192 | console.log("Loading Ninja --> ", this.ninjaVersion); |
176 | 193 | ||
177 | this.application.ninja = this; | 194 | this.application.ninja = this; |