From d8840eda0d3b3e31fb5a72306fe66608f4f99c2b Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 29 May 2012 23:52:59 -0700
Subject: fixing the menu bindings and some cleanup of the stage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/menu/menu-entry.reel/menu-entry.html |  13 +-
 js/components/menu/menu-item.reel/menu-item.html   |  13 +-
 js/components/menu/menu-item.reel/menu-item.js     |  20 +--
 js/components/menu/menu.reel/menu.html             |   5 +-
 js/components/menu/menu.reel/menu.js               |  17 +++
 js/data/menu-data.js                               | 147 +++++++++++++--------
 js/ninja.reel/ninja.html                           |   3 +
 js/stage/stage.reel/stage.js                       |   9 +-
 8 files changed, 125 insertions(+), 102 deletions(-)

diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html
index cd013a4e..f64de3cb 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.html
+++ b/js/components/menu/menu-entry.reel/menu-entry.html
@@ -17,11 +17,7 @@
                     "automaticallyOrganizeObjects": false
                 },
                 "bindings": {
-                    "content": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "data.entries",
-                        "oneway": true
-                    }
+                    "content": {"<-": "@owner.data.entries"}
                 }
             },
 
@@ -39,11 +35,8 @@
                     "element": { "#": "menuEntryItem" }
                 },
                 "bindings": {
-                    "data": {
-                        "boundObject": {"@": "repetition"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    }
+                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
+                    "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"}
                 }
             },
 
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
index 5ff8c0fc..1902833a 100755
--- a/js/components/menu/menu-item.reel/menu-item.html
+++ b/js/components/menu/menu-item.reel/menu-item.html
@@ -17,11 +17,7 @@
                     "automaticallyOrganizeObjects": false
                 },
                 "bindings": {
-                    "content": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "subentries",
-                        "oneway": true
-                    }
+                    "content": {"<-": "@owner.subentries"}
                 }
             },
 
@@ -39,11 +35,8 @@
                     "element": {"#": "menuEntryItem" }
                 },
                 "bindings": {
-                    "data": {
-                        "boundObject": {"@": "repetition"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    }
+                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
+                    "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"}
                 }
             },
 
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 9c18ed37..c00c4412 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -14,7 +14,7 @@ exports.MenuItem = Montage.create(Component, {
     },
 
     _enabled: {
-        value: null
+        value: false
     },
 
     enabled: {
@@ -61,7 +61,6 @@ exports.MenuItem = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            var boundObject = this.application.ninja, strArr = null, i=0;
 
             if(!this.data) return;
 
@@ -82,24 +81,7 @@ exports.MenuItem = Montage.create(Component, {
                 });
 
             }
-/*
-            if(this.data.enabled.boundProperty) {
-
-                boundObject = this.application.ninja[this.data.enabled.boundObj];
-
-                Object.defineBinding(this, "enabled", {
-                  boundObject: boundObject,
-                  boundObjectPropertyPath: this.data.enabled.boundProperty,
-                  boundValueMutator: this.data.enabled.boundValueMutator,
-                  oneway : this.data.enabled.oneway
-                });
 
-            } else {
-            */
-                this.enabled = this.data.enabled;
-            /*
-            }
-            */
             if(this.data.submenu) {
                 this.submenu = true;
 
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index 7f2aeeef..f15cf119 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.html
@@ -12,7 +12,10 @@
     <script type="text/montage-serialization">
         {
             "menudata": {
-                "prototype": "js/data/menu-data"
+                "prototype": "js/data/menu-data",
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
+                }
             },
 
             "menuController": {
diff --git a/js/components/menu/menu.reel/menu.js b/js/components/menu/menu.reel/menu.js
index fb221640..50d3f0bc 100755
--- a/js/components/menu/menu.reel/menu.js
+++ b/js/components/menu/menu.reel/menu.js
@@ -9,6 +9,23 @@ var Montage = require("montage/core/core").Montage,
 
 exports.Menu = Montage.create(Component, {
 
+    _currentDocument: {
+            value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+        }
+    },
+
     _active: {
         value: false
     },
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index aeb95ccc..6c597542 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -4,9 +4,51 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Montage =   require("montage/core/core").Montage;
+var Montage =   require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.MenuData = Montage.create(Component, {
+
+    _currentDocument: {
+            value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+
+            this.documentEnabledIndices.forEach(function(index) {
+                index.enabled = true;
+            });
+
+        }
+    },
+
+    didCreate: {
+        value: function() {
+            var self = this;
+
+            this.topLevelMenu.forEach(function(item) {
+                item.entries.forEach(function(entry) {
+                    if(entry.depend && entry.depend === "document") {
+                        self.documentEnabledIndices.push(entry);
+                    }
+                });
+            });
+        }
+    },
+
+    documentEnabledIndices: {
+        value: []
+    },
 
-exports.MenuData = Montage.create( Montage, {
     topLevelMenu: {
         value: [
                 {
@@ -33,65 +75,47 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Close File",
                             "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "_documents.count()",
-                                "oneway": true
-                            },
+                            "enabled": false,
+                            "depend": "document",
                             "action": "executeFileClose"
                         },
                         {
                             "displayText" : "Close All",
                             "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "_documents.count()",
-                                "oneway": true
-                            },
+                            "enabled": false,
+                            "depend": "document",
                             "action": "executeFileCloseAll"
                         },
                         {
                             "displayText" : "",
-                            "separator":    true
+                            "separator":    true,
+                            "enabled": true
                         },
                         {
                             "displayText" : "Save",
                             "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "_documents.count()",
-                                "oneway": true
-                            },
+                            "enabled": false,
+                            "depend": "document",
                             "action": "executeSave"
                         },
                         {
                             "displayText" : "Save As",
                             "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "_documents.count()",
-                                "oneway": true
-                            },
+                            "enabled": false,
+                            "depend": "document",
                             "action":"executeSaveAs"
                         },
                         {
                             "displayText" : "Save All",
                             "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "_documents.count()",
-                                "oneway": true
-                            },
+                            "enabled": false,
+                            "depend": "document",
                             "action": "executeSaveAll"
                         },
                         {
                             "displayText" : "",
-                            "separator":    true
+                            "separator":    true,
+                            "enabled": true
                         },
                         {
                             "displayText" : "Open Project",
@@ -107,14 +131,6 @@ exports.MenuData = Montage.create( Montage, {
                             "displayText" : "Close Project",
                             "hasSubMenu" : false,
                             "enabled": false
-                        },
-                        {
-                            "displayText" : "",
-                            "separator":    true
-                        },
-                        {
-                            "displayText" : "",
-                            "separator":    true
                         }
                     ]
                 },
@@ -124,7 +140,8 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Undo",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "undocontroller",
                                 "boundProperty": "canUndo",
@@ -135,7 +152,8 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Redo",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "undocontroller",
                                 "boundProperty": "canRedo",
@@ -166,7 +184,9 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Live Preview",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -183,7 +203,9 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Chrome Preview",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -200,7 +222,9 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Layout View",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -246,7 +270,9 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Snap",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -264,7 +290,8 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Snap To",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "newenabled": {
                                 "value": true,
                                 "boundObj": "appModel",
                                 "boundProperty": "snap",
@@ -304,7 +331,9 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Show 3D Grid",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -320,12 +349,15 @@ exports.MenuData = Montage.create( Montage, {
                         },
                         {
                             "displayText" : "",
-                            "separator":    true
+                            "separator":    true,
+                            "enabled": true
                         },
                         {
                             "displayText" : "Front View",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -343,7 +375,9 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Top View",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -361,7 +395,9 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Side View",
                             "hasSubMenu" : false,
-                            "enabled": {
+                            "enabled": false,
+                            "depend": "document",
+                            "newenabled": {
                                 "value": false,
                                 "boundObj": "documentController",
                                 "boundProperty": "activeDocument",
@@ -378,7 +414,8 @@ exports.MenuData = Montage.create( Montage, {
                         },
                         {
                             "displayText" : "",
-                            "separator":    true
+                            "separator":    true,
+                            "enabled": true
                         },
                         {
                             "displayText" : "Debug",
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a62ce458..b341b14a 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -36,6 +36,9 @@
                 "prototype": "js/components/menu/menu.reel",
                 "properties": {
                     "element": {"#": "mainMenuBar"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index a6e7c24f..82c4d652 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -156,8 +156,7 @@ exports.Stage = Montage.create(Component, {
     },
 
     _currentDocument: {
-        value : null,
-        enumerable : false
+        value : null
     },
 
     currentDocument : {
@@ -176,7 +175,6 @@ exports.Stage = Montage.create(Component, {
                 this.hideCanvas(false);
             }
 
-            //console.log("Stage - set current document with value of " + value);
             this._currentDocument = value;
 
             if(this._currentDocument.currentView === "design") {
@@ -188,8 +186,7 @@ exports.Stage = Montage.create(Component, {
                 this.hideRulers();
                 this.hideCanvas(true);
             }
-        },
-        enumerable : false
+        }
     },
 
     _userPaddingLeft: { value: 0 },
@@ -287,8 +284,6 @@ exports.Stage = Montage.create(Component, {
         value: function(didSwitch) {
             var designView = this.application.ninja.currentDocument.model.views.design;
 
-            this.hideCanvas(false);
-
             // Recalculate the canvas sizes because of splitter resizing
             this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this.element.offsetWidth - 11 ;
             this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this.element.offsetHeight - 11;
-- 
cgit v1.2.3