aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 4fea0fe9..0f5503f6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -78,7 +78,7 @@ exports.MenuEntry = Montage.create(Component, {
78 } 78 }
79 }, 79 },
80 80
81 handleClick: { 81 captureMousedown: {
82 value: function(event) { 82 value: function(event) {
83 // TODO: Hack! Rework this! 83 // TODO: Hack! Rework this!
84 this.parentComponent.ownerComponent.toggleActivation(this); 84 this.parentComponent.ownerComponent.toggleActivation(this);
@@ -98,7 +98,7 @@ exports.MenuEntry = Montage.create(Component, {
98 98
99 this.topHeaderText.innerHTML = this.data.header; 99 this.topHeaderText.innerHTML = this.data.header;
100 100
101 this.element.addEventListener("click", this, false); 101 this.element.addEventListener("mousedown", this, true);
102 } 102 }
103 } 103 }
104}); \ No newline at end of file 104}); \ No newline at end of file
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