diff options
Diffstat (limited to 'js/components/menu/menu.reel')
-rwxr-xr-x | js/components/menu/menu.reel/menu.html | 3 | ||||
-rwxr-xr-x | js/components/menu/menu.reel/menu.js | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index f18c1a0f..98ffa92c 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.html | |||
@@ -44,7 +44,8 @@ | |||
44 | "element": { "#": "menuItem" } | 44 | "element": { "#": "menuItem" } |
45 | }, | 45 | }, |
46 | "bindings": { | 46 | "bindings": { |
47 | "data": {"<-": "@repetition.objectAtCurrentIteration"} | 47 | "data": {"<-": "@repetition.objectAtCurrentIteration"}, |
48 | "menuIsActive": {"<-": "@owner.active"} | ||
48 | } | 49 | } |
49 | }, | 50 | }, |
50 | 51 | ||
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 | ||