aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html19
-rwxr-xr-xjs/ninja.reel/ninja.js5
2 files changed, 6 insertions, 18 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 17726712..4f40a3f8 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -52,10 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
52 }, 52 },
53 53
54 "appModel": { 54 "appModel": {
55 "prototype": "js/models/app-model", 55 "prototype": "js/models/app-model"
56 "bindings": {
57 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
58 }
59 }, 56 },
60 57
61 "materialsModel": { 58 "materialsModel": {
@@ -63,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
63 }, 60 },
64 61
65 "menu": { 62 "menu": {
66 "prototype": "js/components/menu/menu.reel", 63 "prototype": "js/ui/menu/menu.reel",
67 "properties": { 64 "properties": {
68 "element": {"#": "mainMenuBar"} 65 "element": {"#": "mainMenuBar"}
69 }, 66 },
@@ -183,17 +180,7 @@ POSSIBILITY OF SUCH DAMAGE.
183 "currentDocument": {"<-": "@documentList.selectedObjects.0"} 180 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
184 } 181 }
185 }, 182 },
186 183
187 "stageMode": {
188 "prototype": "js/components/layout/stage-mode.reel",
189 "properties": {
190 "element": {"#": "stageMode"}
191 },
192 "bindings" : {
193 "chromePreview": {"<->": "@appModel.chromePreview"}
194 }
195 },
196
197 "toolsList": { 184 "toolsList": {
198 "prototype": "js/components/layout/tools-list.reel", 185 "prototype": "js/components/layout/tools-list.reel",
199 "properties": { 186 "properties": {
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 9fd71b1c..42d15d8b 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -351,6 +351,7 @@ exports.Ninja = Montage.create(Component, {
351 this.ninjaVersion = window.ninjaVersion.ninja.version; 351 this.ninjaVersion = window.ninjaVersion.ninja.version;
352 this.undoManager = document.application.undoManager = UndoManager.create(); 352 this.undoManager = document.application.undoManager = UndoManager.create();
353 document.application.njUtils = NjUtils; 353 document.application.njUtils = NjUtils;
354 document.application.model = this.appModel;
354 } 355 }
355 }, 356 },
356 357
@@ -376,9 +377,9 @@ exports.Ninja = Montage.create(Component, {
376 377
377 this.eventManager.addEventListener("selectTool", this, false); 378 this.eventManager.addEventListener("selectTool", this, false);
378 this.eventManager.addEventListener("selectSubTool", this, false); 379 this.eventManager.addEventListener("selectSubTool", this, false);
380 this.eventManager.addEventListener("executePreview", this, false);
379 381
380 this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false); 382 this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false);
381 this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false);
382 this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); 383 this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false);
383 } 384 }
384 }, 385 },
@@ -387,7 +388,7 @@ exports.Ninja = Montage.create(Component, {
387 //////////////////////////////////////////////////////////////////// 388 ////////////////////////////////////////////////////////////////////
388 //////////////////////////////////////////////////////////////////// 389 ////////////////////////////////////////////////////////////////////
389 //TODO: Expand method to allow other browsers for preview 390 //TODO: Expand method to allow other browsers for preview
390 executeChromePreview: { 391 handleExecutePreview: {
391 value: function () { 392 value: function () {
392 //TODO: Make into proper component 393 //TODO: Make into proper component
393 this.saveOperationScreen = {}; 394 this.saveOperationScreen = {};