aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-19 22:31:41 -0700
committerValerio Virgillito2012-06-19 22:31:41 -0700
commitb170ee5133e9ffdacacdf84274b4a1269804a274 (patch)
treee0df912081956fde0fd2df697b7c9686a129d4cd
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
parentfb553a8054162b2aa0848d86b11d4e27002bffa9 (diff)
downloadninja-b170ee5133e9ffdacacdf84274b4a1269804a274.tar.gz
Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js4
-rwxr-xr-xjs/components/menu/menu.reel/menu.js9
2 files changed, 3 insertions, 10 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index b9c546ed..ae3469c6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -83,7 +83,7 @@ exports.MenuEntry = Montage.create(Component, {
83 } 83 }
84 }, 84 },
85 85
86 handleClick: { 86 captureMousedown: {
87 value: function(event) { 87 value: function(event) {
88 // TODO: Hack! Rework this! 88 // TODO: Hack! Rework this!
89 this.parentComponent.ownerComponent.toggleActivation(this); 89 this.parentComponent.ownerComponent.toggleActivation(this);
@@ -105,7 +105,7 @@ exports.MenuEntry = Montage.create(Component, {
105 105
106 this.topHeaderText.innerHTML = this.data.header; 106 this.topHeaderText.innerHTML = this.data.header;
107 107
108 this.element.addEventListener("click", this, false); 108 this.element.addEventListener("mousedown", this, true);
109 109
110 Object.defineBinding(this, "menuIsActive", { 110 Object.defineBinding(this, "menuIsActive", {
111 boundObject: this._menu, 111 boundObject: this._menu,
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