diff options
author | Valerio Virgillito | 2012-07-18 15:08:37 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-18 15:08:37 -0700 |
commit | 819348eaf3ff6b4a8c38ecca7c18f6dacac7f03b (patch) | |
tree | 2d16f0fc70e5f65986accef736583c59fe39a08a /js/ui | |
parent | 2f009ea40ca815a9aff27a5862bba5a6b335586c (diff) | |
download | ninja-819348eaf3ff6b4a8c38ecca7c18f6dacac7f03b.tar.gz |
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>
Diffstat (limited to 'js/ui')
-rw-r--r-- | js/ui/menu/menu-controller.js | 9 | ||||
-rwxr-xr-x | js/ui/menu/menu-entry.reel/menu-entry.css | 2 |
2 files changed, 7 insertions, 4 deletions
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 | ||