diff options
-rw-r--r-- | js/controllers/clipboard-controller.js | 14 | ||||
-rw-r--r-- | js/ui/menu/menu-controller.js | 9 | ||||
-rwxr-xr-x | js/ui/menu/menu-entry.reel/menu-entry.css | 2 |
3 files changed, 17 insertions, 8 deletions
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 | |||
80 | return; | 80 | return; |
81 | }//for design view only | 81 | }//for design view only |
82 | 82 | ||
83 | // Don't do anything if an input or other control is focused | 83 | // Don't do anything if an input or other control is focused except the copy menu button |
84 | if(document.activeElement.nodeName !== "BODY") { | 84 | if(document.activeElement.nodeName !== "BODY") { |
85 | return; | 85 | if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") { |
86 | return; | ||
87 | } | ||
86 | } | 88 | } |
87 | 89 | ||
88 | if(this.clipboardContext === "stage"){ | 90 | if(this.clipboardContext === "stage"){ |
@@ -99,7 +101,9 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
99 | 101 | ||
100 | // Don't do anything if an input or other control is focused | 102 | // Don't do anything if an input or other control is focused |
101 | if(document.activeElement.nodeName !== "BODY") { | 103 | if(document.activeElement.nodeName !== "BODY") { |
102 | return; | 104 | if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") { |
105 | return; | ||
106 | } | ||
103 | } | 107 | } |
104 | 108 | ||
105 | if(this.clipboardContext === "stage"){ | 109 | if(this.clipboardContext === "stage"){ |
@@ -123,7 +127,9 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
123 | 127 | ||
124 | // Don't do anything if an input or other control is focused | 128 | // Don't do anything if an input or other control is focused |
125 | if(document.activeElement.nodeName !== "BODY") { | 129 | if(document.activeElement.nodeName !== "BODY") { |
126 | return; | 130 | if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") { |
131 | return; | ||
132 | } | ||
127 | } | 133 | } |
128 | 134 | ||
129 | //TODO: return if stage is not focussed | 135 | //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, { | |||
336 | "checked": false, | 336 | "checked": false, |
337 | "submenu" : false, | 337 | "submenu" : false, |
338 | "entries": [], | 338 | "entries": [], |
339 | "enabled": true, | 339 | "enabled": false, |
340 | "depend": "document", | ||
340 | "action": "executeCut" | 341 | "action": "executeCut" |
341 | }, | 342 | }, |
342 | { | 343 | { |
@@ -344,7 +345,8 @@ exports.MenuController = Montage.create(Component, { | |||
344 | "checked": false, | 345 | "checked": false, |
345 | "submenu" : false, | 346 | "submenu" : false, |
346 | "entries": [], | 347 | "entries": [], |
347 | "enabled": true, | 348 | "enabled": false, |
349 | "depend": "document", | ||
348 | "action": "executeCopy" | 350 | "action": "executeCopy" |
349 | }, | 351 | }, |
350 | { | 352 | { |
@@ -352,7 +354,8 @@ exports.MenuController = Montage.create(Component, { | |||
352 | "checked": false, | 354 | "checked": false, |
353 | "submenu" : false, | 355 | "submenu" : false, |
354 | "entries": [], | 356 | "entries": [], |
355 | "enabled": true, | 357 | "enabled": false, |
358 | "depend": "document", | ||
356 | "action": "executePaste" | 359 | "action": "executePaste" |
357 | } | 360 | } |
358 | ] | 361 | ] |
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. | |||
53 | -webkit-box-shadow: none; | 53 | -webkit-box-shadow: none; |
54 | } | 54 | } |
55 | 55 | ||
56 | .selected { | 56 | .topMenuItem.selected { |
57 | background-color: #222222; | 57 | background-color: #222222; |
58 | } | 58 | } |
59 | 59 | ||