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

5 files changed, 31 insertions, 76 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
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index f9a625a3..3a5bf4ab 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -10,18 +10,15 @@ var Component = require("montage/ui/component").Component;
 exports.MenuItem = Montage.create(Component, {
 
     itemBackground: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     itemText: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     subMenu: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     data: {
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));
-
         }
     },
 
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 529ec1c8..4667f2b4 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -29,49 +29,27 @@ exports.ColorPopupManager = Montage.create(Component, {
         enumerable: false,
         value: function () {
                 ////////////////////////////////////////////////////////////
-            //TODO: Improve logic on handling closing the popup
-            ////////////////////////////////////////////////////////////
-            //Hiding popup on any panel(s) actions
-            this.eventManager.addEventListener("panelOrderChanged", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelClose", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelCollapsed", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelSelected", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("togglePanel", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelResizing", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelResizedStart", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelResizedEnd", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
+            //Closing popups on resize