Merge branch 'refs/heads/NINJAmaster' into TimelineUber

1 files changed, 4 insertions, 36 deletions

diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 12007f4a..3333d209 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -154,17 +154,17 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Cut",
                             "hasSubMenu" : false,
-                            "enabled": true
+                            "enabled": false
                         },
                         {
                             "displayText" : "Copy",
                             "hasSubMenu" : false,
-                            "enabled": true
+                            "enabled": false
                         },
                         {
                             "displayText" : "Paste",
                             "hasSubMenu" : false,
-                            "enabled": true
+                            "enabled": false
                         }
                     ]
                 },
@@ -172,38 +172,6 @@ exports.MenuData = Montage.create( Montage, {
                     "header": "View",
                     "entries": [
                         {
-                            "displayText" : "Zoom In",
-                            "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "activeDocument",
-                                "oneway": true,
-                                "boundValueMutator": function(activeDocument){
-                                    if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;}
-                                    else{return false;}
-                                }
-                            }
-                        },
-                        {
-                            "displayText" : "Zoom Out",
-                            "hasSubMenu" : false,
-                            "enabled": {
-                                "value": false,
-                                "boundObj": "documentController",
-                                "boundProperty": "activeDocument",
-                                "oneway": true,
-                                "boundValueMutator": function(activeDocument){
-                                    if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;}
-                                    else{return false;}
-                                }
-                            }
-                        },
-                        {
-                            "displayText" : "",
-                            "separator":    true
-                        },
-                        {
                             "displayText" : "Live Preview",
                             "hasSubMenu" : false,
                             "enabled": {
@@ -431,7 +399,7 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "Debug",
                             "hasSubMenu" : false,
-                            "enabled": true,
+                            "enabled": false,
                             "checked": {
                                 "value": true,
                                 "boundProperty": "debug"