Merge branch 'menu-fixes' of https://github.com/mencio/ninja into v0.7.1

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.
                 },
     
                 "appModel": {
-                    "prototype": "js/models/app-model",
-                    "bindings": {
-                        "currentDocument": {"<-": "@documentList.selectedObjects.0"}
-                    }
+                    "prototype": "js/models/app-model"
                 },
     
                 "materialsModel": {
@@ -63,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 },
     
                 "menu": {
-                    "prototype": "js/components/menu/menu.reel",
+                    "prototype": "js/ui/menu/menu.reel",
                     "properties": {
                         "element": {"#": "mainMenuBar"}
                     },
@@ -183,17 +180,7 @@ POSSIBILITY OF SUCH DAMAGE.
                         "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                     }
                 },
-    
-                "stageMode": {
-                    "prototype": "js/components/layout/stage-mode.reel",
-                    "properties": {
-                        "element": {"#": "stageMode"}
-                    },
-                    "bindings" : {
-                        "chromePreview": {"<->": "@appModel.chromePreview"}
-                    }
-                },
-    
+
                 "toolsList": {
                     "prototype": "js/components/layout/tools-list.reel",
                     "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, {
             this.ninjaVersion = window.ninjaVersion.ninja.version;
             this.undoManager = document.application.undoManager = UndoManager.create();
             document.application.njUtils = NjUtils;
+            document.application.model = this.appModel;
         }
     },
 
@@ -376,9 +377,9 @@ exports.Ninja = Montage.create(Component, {
 
             this.eventManager.addEventListener("selectTool", this, false);
             this.eventManager.addEventListener("selectSubTool", this, false);
+            this.eventManager.addEventListener("executePreview", this, false);
 
             this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false);
-            this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false);
             this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false);
         }
     },
@@ -387,7 +388,7 @@ exports.Ninja = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
     //TODO: Expand method to allow other browsers for preview
-    executeChromePreview: {
+    handleExecutePreview: {
         value: function () {
             //TODO: Make into proper component
             this.saveOperationScreen = {};