Merge branch 'refs/heads/Ninja-Internal' into Color

1 files changed, 8 insertions, 22 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..0f5503f6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -9,18 +9,15 @@ var Component = require("montage/ui/component").Component;
 
 exports.MenuEntry = Montage.create(Component, {
     topHeader: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     topHeaderText: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     subEntries: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     // Reference to the parent Menu component
@@ -36,8 +33,7 @@ exports.MenuEntry = Montage.create(Component, {
             if(value !== this._menu) {
                 this._menu = value;
             }
-        },
-        serializable: true
+        }
     },
 
     _data: {
@@ -52,8 +48,7 @@ exports.MenuEntry = Montage.create(Component, {
             if(this._data !== value) {
                 this._data = value;
             }
-        },
-        serializable: true
+        }
     },
 
     select: {
@@ -79,22 +74,20 @@ exports.MenuEntry = Montage.create(Component, {
             return this._menuIsActive;
         },
         set: function(value) {
-            if(value)  this.topHeader.addEventListener("mouseover", this, false);
+            if(value)  this.element.addEventListener("mouseover", this, false);
         }
     },
 
-    handleClick: {
+    captureMousedown: {
         value: function(event) {
             // TODO: Hack! Rework this!
             this.parentComponent.ownerComponent.toggleActivation(this);
-//            this._menu.toggleActivation(this);
         }
     },
 
     handleMouseover: {
         value: function(event) {
             this.parentComponent.ownerComponent.activeEntry = this;
-//            this._menu.activeEntry = this;
         }
     },
 
@@ -105,14 +98,7 @@ exports.MenuEntry = Montage.create(Component, {
 
             this.topHeaderText.innerHTML = this.data.header;
 
-            this.element.addEventListener("click", this, false);
-
-            Object.defineBinding(this, "menuIsActive", {
-                boundObject: this._menu,
-                boundObjectPropertyPath: "active",
-                oneway: true
-            });
-
+            this.element.addEventListener("mousedown", this, true);
         }
     }
 });
\ No newline at end of file