4 files changed, 481 insertions, 396 deletions

diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 64a89a6a..8d975c4b 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -61,6 +61,8 @@ exports.MenuItem = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            var boundObject = this.application.ninja, strArr = null, i=0;
+
             if(!this.data) return;
 
             if(this.data.separator) {
@@ -82,9 +84,16 @@ exports.MenuItem = Montage.create(Component, {
             }
 
             if(this.data.enabled.boundProperty) {
+                strArr = this.data.enabled.boundObj.split(".");
+                for(i=0;i<strArr.length;i++){
+                    boundObject = boundObject[strArr[i]];
+                }
+
                 Object.defineBinding(this, "enabled", {
-                  boundObject: this.application.ninja[this.data.enabled.boundObj],
-                  boundObjectPropertyPath: this.data.enabled.boundProperty
+                  boundObject: boundObject,
+                  boundObjectPropertyPath: this.data.enabled.boundProperty,
+                  boundValueMutator: this.data.enabled.boundValueMutator,
+                  oneway : this.data.enabled.oneway
                 });
 
             } else {
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7d982a62..4363e440 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -32,22 +32,30 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
     _codeMirrorCounter: {value: 1, enumerable: false},
+
+    canSave:{value: false},//for Save menu state update
+    canSaveAll:{value: false},//for Save All menu state update
     
     activeDocument: {
         get: function() {
             return this._activeDocument;
         },
         set: function(doc) {
-            if(!!this._activeDocument) this._activeDocument.isActive = false;
-
+            if(!!this._activeDocument){ this._activeDocument.isActive = false;}
             this._activeDocument = doc;
             if(!!this._activeDocument){
-
                 if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
                 this._activeDocument.isActive = true;
+
                 if(!!this._activeDocument.editor){
                     this._activeDocument.editor.focus();
                 }
+
+                this.canSave = doc.needsSave;
+                this.canSaveAll = doc.needsSave;
+            }else{
+                this.canSave = false;
+                this.canSaveAll = false;
             }
         }
     },
@@ -61,6 +69,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeSaveAs", this, false);
             this.eventManager.addEventListener("executeSaveAll", this, false);
             this.eventManager.addEventListener("executeFileClose", this, false);
+            this.eventManager.addEventListener("executeFileCloseAll", this, false);
 
             this.eventManager.addEventListener("styleSheetDirty", this, false);
             
@@ -172,6 +181,17 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
     ////////////////////////////////////////////////////////////////////
+    handleExecuteFileCloseAll:{
+            value: function(event) {
+                var i=0;
+                if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
+                    while(this._documents.length > 0){
+                        this.closeDocument(this._documents[this._documents.length -1].uuid);
+                    }
+                }
+            }
+        },
+        ////////////////////////////////////////////////////////////////////
     //
     fileSaveResult: {
         value: function (result) {
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 40512f5d..093ecf14 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -4,414 +4,464 @@ 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;
 
 exports.MenuData = Montage.create( Montage, {
     topLevelMenu: {
         value: [
-            {
-                "header": "File",
-                "entries": [
-                    {
-                        "displayText" : "New Project",
-                        "hasSubMenu" : false,
-                        "enabled": false,
-                        "action":   "executeNewProject"
-                    },
-                    {
-                        "displayText" : "New File",
-                        "hasSubMenu" : false,
-                        "enabled": true,
-                        "action":   "executeNewFile"
-                    },
-                    {
-                        "displayText" : "Open File",
-                        "hasSubMenu" : false,
-                        "enabled": true,
-                        "action": "executeFileOpen"
-                    },
-                    {
-                        "displayText" : "Close File",
-                        "hasSubMenu" : false,
-                        "enabled": true,
-                        "action": "executeFileClose"
-                    },
-                    {
-                        "displayText" : "",
-                        "separator":    true
-                    },
-                    {
-                        "displayText" : "Save",
-                        "hasSubMenu" : false,
-                        "enabled": true,
-                        "action": "executeSave"
-                    },
-                    {
-                        "displayText" : "Save As",
-                        "hasSubMenu" : false,
-                        "enabled": true,
-                        "action":"executeSaveAs"
-                    },
-                    {
-                        "displayText" : "Save All",
-                        "hasSubMenu" : false,
-                        "enabled": true,
-                        "action": "executeSaveAll"
-                    },
-                    {
-                        "displayText" : "",
-                        "separator":    true
-                    },
-                    {
-                        "displayText" : "Open Project",
-                        "hasSubMenu" : false,
-                        "enabled": false
-                    },
-                    {
-                        "displayText" : "Open Recent",
-                        "hasSubMenu" : false,
-                        "enabled": false
-                    },
-                    {
-                        "displayText" : "Close Project",
-                        "hasSubMenu" : false,
-                        "enabled": false
-                    }
-                ]
-            },
-            {
-                "header": "Edit",
-                "entries": [
-                    {
-                        "displayText" : "Undo",
-                        "hasSubMenu" : false,
-                        "enabled": {
-                            "value": false,
-                            "boundObj": "undocontroller",
-                            "boundProperty": "canUndo"
-                        },
-                        "action":   "executeUndo"
-                    },
-                    {
-                        "displayText" : "Redo",
-                        "hasSubMenu" : false,
-                        "enabled": {
-                            "value": false,
+                {
+                    "header": "File",
+                    "entries": [
+                        {
+                            "displayText" : "New Project",
+                            "hasSubMenu" : false,
+                            "enabled": false,
+                            "action":   "executeNewProject"
+                        },
+                        {
+                            "displayText" : "New File",
+                            "hasSubMenu" : false,
+                            "enabled": true,
+                            "action":   "executeNewFile"
+                        },
+                        {
+                            "displayText" : "Open File",
+                            "hasSubMenu" : false,
+                            "enabled": true,
+                            "action": "executeFileOpen"
+                        },
+                        {
+                            "displayText" : "Close File",
+                            "hasSubMenu" : false,
+                            "enabled": {
+                                "value": false,
+                                "boundObj": "documentController",
+                                "boundProperty": "activeDocument",
+                                "oneway": true,
+                                "boundValueMutator": function(activeDocument){
+                                    if(activeDocument !== null){return true;}
+                                    else{return false;}