integrating v0.7 montage into ninja

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 77 insertions, 38 deletions

diff --git a/node_modules/montage/ui/component.js b/node_modules/montage/ui/component.js
index d347f655..69559fc1 100755
--- a/node_modules/montage/ui/component.js
+++ b/node_modules/montage/ui/component.js
@@ -59,7 +59,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         value: function() {
             var actionEvent = document.createEvent("CustomEvent");
             actionEvent.initCustomEvent("action", true, true, null);
-            actionEvent.type = "action";
             return actionEvent;
         }
     },
@@ -162,6 +161,15 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         }
     },
 
+    setElementWithParentComponent: {
+        value: function(element, parent) {
+            this._alternateParentComponent = parent;
+            if (this.element != element) {
+                this.element = element;
+            }
+        }
+    },
+
     // access to the Application object
 /**
     Description TODO
@@ -215,6 +223,11 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
             return targetElementController;
         }
     },
+
+    _alternateParentComponent: {
+        value: null
+    },
+
 /**
   Description TODO
   @private
@@ -235,21 +248,27 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         get: function() {
             var cachedParentComponent = this._cachedParentComponent;
             if (cachedParentComponent == null) {
-                var anElement = this.element,
-                    aParentNode,
-                    eventManager = this.eventManager;
-                if (anElement) {
-                    while ((aParentNode = anElement.parentNode) !== null && eventManager.eventHandlerForElement(aParentNode) == null) {
-                        anElement = aParentNode;
-                    }
-                    return (this._cachedParentComponent = aParentNode ? eventManager.eventHandlerForElement(aParentNode) : null);
-                }
+                return (this._cachedParentComponent = this.findParentComponent());
             } else {
                 return cachedParentComponent;
             }
         }
     },
 
+    findParentComponent: {
+        value: function() {
+            var anElement = this.element,
+                aParentNode,
+                eventManager = this.eventManager;
+            if (anElement) {
+                while ((aParentNode = anElement.parentNode) !== null && eventManager.eventHandlerForElement(aParentNode) == null) {
+                    anElement = aParentNode;
+                }
+                return aParentNode ? eventManager.eventHandlerForElement(aParentNode) : this._alternateParentComponent;
+            }
+        }
+    },
+
     querySelectorComponent: {
         value: function(selector) {
             if (typeof selector !== "string") {
@@ -406,19 +425,30 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
     attachToParentComponent: {
         value: function() {
             this._cachedParentComponent = null;
-            
-            var parentComponent = this.parentComponent;
-            
+
+            var parentComponent = this.parentComponent,
+                childComponents,
+                childComponent;
+
             if (parentComponent) {
+                childComponents = parentComponent.childComponents;
+                for (var i = 0; (childComponent = childComponents[i]); i++) {
+                    var newParentComponent = childComponent.findParentComponent();
+                    if (newParentComponent === this) {
+                        parentComponent.removeChildComponent(childComponent);
+                        newParentComponent._addChildComponent(childComponent);
+                    }
+                }
+
                 parentComponent._addChildComponent(this);
             }
         }
     },
-    
+
     detachFromParentComponent: {
         value: function() {
             var parentComponent = this.parentComponent;
-            
+
             if (parentComponent) {
                 parentComponent.removeChildComponent(this);
             }
@@ -438,6 +468,7 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
             if (ix > -1) {
                 childComponents.splice(ix, 1);
                 childComponent._cachedParentComponent = null;
+                childComponent._alternateParentComponent = null;
             }
         }
     },
@@ -458,7 +489,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
     */
     ownerComponent: {
         enumerable: false,
-        serializable: true,
         value: null
     },
 /**
@@ -488,7 +518,7 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         enumerable: false,
         value: null
     },
-    
+
     /**
      * Remove all bindings and starts buffering the needsDraw.
      * @function
@@ -498,23 +528,20 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
             this.needsDraw = false;
             this.traverseComponentTree(function(component) {
                 Object.deleteBindings(component);
-                component.canDrawGate.setField("componentTreeLoaded", false);
-                component.blockDrawGate.setField("element", false);
-                component.blockDrawGate.setField("drawRequested", false);
                 component.needsDraw = false;
             });
         }
     },
-    
+
     originalContent: {
         value: null
     },
-    
+
     _newContent: {
         enumerable: false,
         value: null
     },
-    
+
     content: {
         get: function() {
             if (this._element) {
@@ -526,21 +553,21 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         set: function(value) {
             var components = [],
                 childNodes;
-                
+
             this._newContent = value;
             this.needsDraw = true;
-            
+
             if (typeof this.contentWillChange === "function") {
                 this.contentWillChange(value);
             }
-            
+
             // cleanup current content
             components = this.childComponents;
             for (var i = 0, component; (component = components[i]); i++) {
                 component.detachFromParentComponent();
                 component.cleanupDeletedComponentTree();
             }
-            
+
             if (value instanceof Element) {
                 findAndDetachComponents(value);