integrating the latest montage version

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

1 files changed, 135 insertions, 66 deletions

diff --git a/node_modules/montage/ui/component.js b/node_modules/montage/ui/component.js
index 17f87b62..9d963ada 100755
--- a/node_modules/montage/ui/component.js
+++ b/node_modules/montage/ui/component.js
@@ -414,6 +414,11 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
     _template: {
         value: null
     },
+
+    // Tree level necessary for ordering drawing re: parent-child
+    _treeLevel: {
+        value: 0
+    },
 /**
     Description TODO
     @function
@@ -909,15 +914,15 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         if (!templateModuleId) {
             moduleId = info.moduleId;
             // TODO: backwards compatibility for components with its controller outside the reel folder
-            //console.log(moduleId);
-            if (/([^\/]+)\.reel\/\1$/.exec(moduleId)) {
-                templateModuleId = moduleId + ".html";
-            } else if (/([^\/]+)\.reel$/.exec(moduleId)) {
-                templateModuleId = moduleId + "/" + RegExp.$1 + ".html";
-            } else {
-                templateModuleId = moduleId + ".reel/" + moduleId.split("/").pop() + ".html";
-            }
-            //console.log(moduleId + " === " + templateModuleId);
+            //if (/([^\/]+)\.reel\/\1$/.exec(moduleId)) {
+            //    templateModuleId = moduleId + ".html";
+            //} else if (/([^\/]+)\.reel$/.exec(moduleId)) {
+            //    templateModuleId = moduleId + "/" + RegExp.$1 + ".html";
+            //} else {
+                var slashIndex = moduleId.lastIndexOf("/");
+                //templateModuleId = moduleId + ".reel/" + moduleId.split("/").pop() + ".html";
+                templateModuleId = moduleId + "/" + moduleId.slice(slashIndex === -1 ? 0 : slashIndex+1, -5) + ".html";
+            //}
         }
         if (logger.isDebug) {
             logger.debug(this, "Will load " + templateModuleId);
@@ -971,14 +976,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         enumerable: false,
         value: false
     },
-/**
-  Description TODO
-  @private
-*/
-    _isDrawing: {
-        enumerable: false,
-        value: false
-    },
 
     /**
         If needsDraw property returns true this call adds the current component instance to the rootComponents draw list.<br>
@@ -989,11 +986,11 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
      */
     _drawIfNeeded: {
         enumerable: false,
-        value: function _drawIfNeeded() {
-            var body,
-                childComponent,
+        value: function _drawIfNeeded(level) {
+            var childComponent,
                 oldDrawList;
-            if (this.needsDraw) {
+            this._treeLevel = level;
+            if (this.needsDraw && !this._addedToDrawCycle) {
                 rootComponent.addToDrawCycle(this);
             }
             if (drawLogger.isDebug) {
@@ -1011,7 +1008,7 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
                         drawLogger.debug(this, "childComponent: " + childComponent.element + "; canDraw: " + childComponent.canDraw());
                     }
                     if (childComponent.canDraw()) { // TODO if canDraw is false when does needsDraw get reset?
-                        childComponent._drawIfNeeded();
+                        childComponent._drawIfNeeded(level+1);
                     }
                 }
             }
@@ -1066,11 +1063,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
             if (this._templateElement) {
                 this._replaceElementWithTemplate();
             }
-            // TODO: removeAttribute only here for backwards compatibility
-            if (!this._element.getAttribute("data-montage-id")) {
-                this._element.removeAttribute("id");
-            }
-
             // This will schedule a second draw for any component that has children
             var childComponents = this.childComponents;
             for (var i = 0, childComponent; (childComponent = childComponents[i]); i++) {
@@ -1153,16 +1145,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         value: function() {
         }
     },
-
-    /**
-        Allows draw to be called even if the children can't draw.
-        @type {Property}
-        @default {Boolean} false
-    */
-    allowsPartialDraw: {
-        value: false
-    },
-
 /**
         Description TODO
         @type {Property}
@@ -1296,10 +1278,7 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         enumerable: false,
         value: function(childComponent) {
             this.__addToDrawList(childComponent);
-            // if we are not added to the parent yet we add ourselves so that we build the tree
-            if (!this._isDrawing) {
-                this._addToParentsDrawList();
-            }
+            this._addToParentsDrawList();
         }
     },
 
@@ -1411,12 +1390,10 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
     */
     clearAllComposers: {
         value: function() {
-            var length, i;
-            length = this.composerList.length;
-            for (i = 0; i < length; i++) {
-                this.composerList[i].unload();
+            var composer;
+            while (composer = this.composerList.shift()) {
+                composer.unload();
             }
-            this.composerList = [];
         }
     }
 
@@ -1623,6 +1600,12 @@ var rootComponent = Montage.create(Component, /** @lends module:montage/ui/compo
         }
     },
 
+    // Create a second composer list so that the lists can be swapped during a draw instead of creating a new array every time
+    composerListSwap: {
+        value: [],
+        distinct: true
+    },
+
     /*
         Flag to track if a composer is requesting a draw
         @private
@@ -1669,6 +1652,58 @@ var rootComponent = Montage.create(Component, /** @lends module:montage/ui/compo
     _frameTime: {
         value: null
     },
+
+    // oldSource and diff are used to detect DOM modifications outside of the
+    // draw loop, but only if drawLogger.isDebug is true.
+    _oldSource: {
+        value: null
+    },
+    _diff: {
+        // Written by John Resig. Used under the Creative Commons Attribution 2.5 License.
+        // http://ejohn.org/projects/javascript-diff-algorithm/
+        value: function( o, n ) {
+            var ns = {};
+            var os = {};
+
+            for ( var i = 0; i < n.length; i++ ) {
+              if ( ns[ n[i] ] == null )
+                ns[ n[i] ] = { rows: [], o: null };
+              ns[ n[i] ].rows.push( i );
+            }
+
+            for (i = 0; i < o.length; i++ ) {
+              if ( os[ o[i] ] == null )
+                os[ o[i] ] = { rows: [], n: null };
+              os[ o[i] ].rows.push( i );
+            }
+
+            for (i in ns ) {
+              if ( ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1 ) {
+                n[ ns[i].rows[0] ] = { text: n[ ns[i].rows[0] ], row: os[i].rows[0] };
+                o[ os[i].rows[0] ] = { text: o[ os[i].rows[0] ], row: ns[i].rows[0] };
+              }
+            }
+
+            for (i = 0; i < n.length - 1; i++ ) {
+              if ( n[i].text != null && n[i+1].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null &&
+                   n[i+1] == o[ n[i].row + 1 ] ) {
+                n[i+1] = { text: n[i+1], row: n[i].row + 1 };
+                o[n[i].row+1] = { text: o[n[i].row+1], row: i + 1 };
+              }
+            }
+
+            for (i = n.length - 1; i > 0; i-- ) {
+              if ( n[i].text != null && n[i-1].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null &&