From 819348eaf3ff6b4a8c38ecca7c18f6dacac7f03b Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 18 Jul 2012 15:08:37 -0700
Subject: Fixed some issues with the menu-fixes

- Fixed the dark background on file open
- Fixed the copy/paste/cut menu not working.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/controllers/clipboard-controller.js    | 14 ++++++++++----
 js/ui/menu/menu-controller.js             |  9 ++++++---
 js/ui/menu/menu-entry.reel/menu-entry.css |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'js')

diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index d2173e31..afc94c8c 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -80,9 +80,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 return;
             }//for design view only
 
-            // Don't do anything if an input or other control is focused
+            // Don't do anything if an input or other control is focused except the copy menu button
             if(document.activeElement.nodeName !== "BODY") {
-                return;
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
             }
 
             if(this.clipboardContext === "stage"){
@@ -99,7 +101,9 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                return;
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
             }
 
             if(this.clipboardContext === "stage"){
@@ -123,7 +127,9 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                return;
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
             }
 
             //TODO: return if stage is not focussed
diff --git a/js/ui/menu/menu-controller.js b/js/ui/menu/menu-controller.js
index 3562a888..b6e045db 100644
--- a/js/ui/menu/menu-controller.js
+++ b/js/ui/menu/menu-controller.js
@@ -336,7 +336,8 @@ exports.MenuController = Montage.create(Component, {
                             "checked": false,
                             "submenu" : false,
                             "entries": [],
-                            "enabled": true,
+                            "enabled": false,
+                            "depend": "document",
                             "action":   "executeCut"
                         },
                         {
@@ -344,7 +345,8 @@ exports.MenuController = Montage.create(Component, {
                             "checked": false,
                             "submenu" : false,
                             "entries": [],
-                            "enabled": true,
+                            "enabled": false,
+                            "depend": "document",
                             "action":   "executeCopy"
                         },
                         {
@@ -352,7 +354,8 @@ exports.MenuController = Montage.create(Component, {
                             "checked": false,
                             "submenu" : false,
                             "entries": [],
-                            "enabled": true,
+                            "enabled": false,
+                            "depend": "document",
                             "action":   "executePaste"
                         }
                     ]
diff --git a/js/ui/menu/menu-entry.reel/menu-entry.css b/js/ui/menu/menu-entry.reel/menu-entry.css
index 70e8c400..e8ba5fa6 100755
--- a/js/ui/menu/menu-entry.reel/menu-entry.css
+++ b/js/ui/menu/menu-entry.reel/menu-entry.css
@@ -53,7 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
     -webkit-box-shadow: none;
 }
 
-.selected {
+.topMenuItem.selected {
     background-color: #222222;
 }
 
-- 
cgit v1.2.3