diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/menu/menu-entry.reel | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/menu/menu-entry.reel')
| -rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.html | 2 | ||||
| -rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.js | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html index 1b64c489..4144cee4 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.html +++ b/js/components/menu/menu-entry.reel/menu-entry.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js index 17f847d4..6c49af8f 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.js +++ b/js/components/menu/menu-entry.reel/menu-entry.js | |||
| @@ -102,10 +102,21 @@ exports.MenuEntry = Montage.create(Component, { | |||
| 102 | } | 102 | } |
| 103 | }, | 103 | }, |
| 104 | 104 | ||
| 105 | toggleOnMenuItemAction: { | ||
| 106 | value: function() { | ||
| 107 | // TODO: Hack! Rework this! | ||
| 108 | //for non menu headers only | ||
| 109 | this.parentComponent.ownerComponent.toggleActivation(this); | ||
| 110 | } | ||
| 111 | }, | ||
| 112 | |||
| 105 | captureMousedown: { | 113 | captureMousedown: { |
| 106 | value: function(event) { | 114 | value: function(event) { |
| 107 | // TODO: Hack! Rework this! | 115 | // TODO: Hack! Rework this! |
| 108 | this.parentComponent.ownerComponent.toggleActivation(this); | 116 | //for menu headers only |
| 117 | if(event.target.getAttribute("data-montage-id") === "topHeaderText"){ | ||
| 118 | this.parentComponent.ownerComponent.toggleActivation(this); | ||
| 119 | } | ||
| 109 | } | 120 | } |
| 110 | }, | 121 | }, |
| 111 | 122 | ||