diff options
author | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
commit | 3f5aa43b5b545cd551c5585ef5f2d478c2d49cad (patch) | |
tree | fe5beec45a8d7f45a90659e95c4f13a679ae35d5 /js/components/menu/menu.reel/menu.js | |
parent | 5c4ff40d7950282a179dcfd49c5ea9234e0a8185 (diff) | |
parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
download | ninja-3f5aa43b5b545cd551c5585ef5f2d478c2d49cad.tar.gz |
Merge branch 'refs/heads/master' into montage-v11-integration
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/menu/menu.reel/menu.js')
-rwxr-xr-x | js/components/menu/menu.reel/menu.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/js/components/menu/menu.reel/menu.js b/js/components/menu/menu.reel/menu.js index 50d3f0bc..1560100a 100755 --- a/js/components/menu/menu.reel/menu.js +++ b/js/components/menu/menu.reel/menu.js | |||
@@ -83,19 +83,12 @@ exports.Menu = Montage.create(Component, { | |||
83 | 83 | ||
84 | handleMousedown: { | 84 | handleMousedown: { |
85 | value: function(evt) { | 85 | value: function(evt) { |
86 | |||
87 | if(this.active && (this.getZIndex(evt.target) < 9000 || evt.target.id === "topMenu")) { | 86 | if(this.active && (this.getZIndex(evt.target) < 9000 || evt.target.id === "topMenu")) { |
88 | this._activeEntry.deselect(); | 87 | this._activeEntry.deselect(); |
89 | this._activeEntry = null; | 88 | this._activeEntry = null; |
90 | this.active = false; | 89 | this.active = false; |
91 | 90 | this.element.ownerDocument.removeEventListener('mousedown', this, false); | |
92 | //console.log(this.rep.objects[1]); | ||
93 | //this.controller.content[1].header = "BLAH"; | ||
94 | } | 91 | } |
95 | |||
96 | // console.log(evt.target.style['z-index']); | ||
97 | // console.log(this.getZIndex(evt.target)); | ||
98 | |||
99 | } | 92 | } |
100 | }, | 93 | }, |
101 | 94 | ||