Merge branch 'refs/heads/NINJAmaster' into TimelineUber

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 @@
                     "element": { "#": "menuItem" }
                 },
                 "bindings": {
-                    "data": {"<-": "@repetition.objectAtCurrentIteration"}
+                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
+                    "menuIsActive": {"<-": "@owner.active"}
                 }
             },
             
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, {
 
     handleMousedown: {
         value: function(evt) {
-
             if(this.active && (this.getZIndex(evt.target) < 9000 || evt.target.id === "topMenu")) {
                 this._activeEntry.deselect();
                 this._activeEntry = null;
                 this.active = false;
-
-                //console.log(this.rep.objects[1]);
-                //this.controller.content[1].header = "BLAH";
+                this.element.ownerDocument.removeEventListener('mousedown', this, false);
             }
-
-//            console.log(evt.target.style['z-index']);
-//            console.log(this.getZIndex(evt.target));
-
         }
     },