upgrading to Montage v0.6

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

16 files changed, 408 insertions, 253 deletions

diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js
index b00a5b22..f0d3e540 100755
--- a/node_modules/montage/core/converter/date-converter.js
+++ b/node_modules/montage/core/converter/date-converter.js
@@ -2573,6 +2573,15 @@ var DateValidator = exports.DateValidator = Montage.create(Validator,/** @lends
 @class module:montage/core/converter/date-converter.DateConverter
 */
 var DateConverter = exports.DateConverter = Montage.create(Converter,/** @lends module:montage/core/converter/date-converter.DateConverter# */ {
+    /**
+     Specifies whether the converter allows partial conversion.
+     @type {Property}
+     @default {Boolean} true
+     */
+    allowPartialConversion: {
+        value: false
+    },
+
 /**
         @type {Property}
         @default {Function} Montage.create(DateValidator)
diff --git a/node_modules/montage/core/core.js b/node_modules/montage/core/core.js
index b665f591..8c1f4249 100755
--- a/node_modules/montage/core/core.js
+++ b/node_modules/montage/core/core.js
@@ -788,7 +788,8 @@ Description
 */
 Object.defineProperty(Object.prototype, "setProperty", {
     value: function(aPropertyPath, value) {
-        var lastDotIndex = aPropertyPath.lastIndexOf("."),
+        var propertyIsNumber = !isNaN(aPropertyPath),
+            lastDotIndex = propertyIsNumber ? -1 : aPropertyPath.lastIndexOf("."),
             setObject,
             lastObjectAtPath,
             propertyToSetOnArray;
@@ -883,9 +884,10 @@ Object.defineProperty(Array.prototype, "getProperty", {
         currentIndex = currentIndex || 0;
 
         var result,
-            parenthesisStartIndex = aPropertyPath.indexOf("(", currentIndex),
-            parenthesisEndIndex = aPropertyPath.lastIndexOf(")"),
-            currentPathComponentEndIndex = aPropertyPath.indexOf(".", currentIndex),
+            propertyIsNumber = !isNaN(aPropertyPath),
+            parenthesisStartIndex = propertyIsNumber ? -1 : aPropertyPath.indexOf("(", currentIndex),
+            parenthesisEndIndex = propertyIsNumber ? -1 : aPropertyPath.lastIndexOf(")"),
+            currentPathComponentEndIndex = propertyIsNumber ? -1 : aPropertyPath.indexOf(".", currentIndex),
             nextDelimiterIndex = -1,
             itemResult,
             index,
@@ -917,7 +919,7 @@ Object.defineProperty(Array.prototype, "getProperty", {
         }
 
         // Find the component of the propertyPath we want to deal with during this particular invocation of this function
-        currentPathComponent = aPropertyPath.substring(currentIndex, (nextDelimiterIndex === -1 ? aPropertyPath.length : nextDelimiterIndex));
+        currentPathComponent = propertyIsNumber ? aPropertyPath : aPropertyPath.substring(currentIndex, (nextDelimiterIndex === -1 ? aPropertyPath.length : nextDelimiterIndex));
 
         // EVALUATE: Determine the value of the currentPathComponent
 
@@ -1115,8 +1117,14 @@ Object.defineProperty(Object.prototype, "parentProperty", {
     writable: true
 });
 
-var EventManager = require("core/event/event-manager").EventManager;
-EventManager.create().initWithWindow(window);
+// XXX Does not presently function server-side
+if (typeof window !== "undefined") {
+
+    var EventManager = require("core/event/event-manager").EventManager;
+    EventManager.create().initWithWindow(window);
+
+    // Now that we have a defaultEventManager we can setup the bindings system
+    require("core/event/binding");
+
+}
 
-// Now that we have a defaultEventManager we can setup the bindings system
-require("core/event/binding");
diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index 8f1f0831..09635153 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -15,11 +15,17 @@ var Montage = require("montage").Montage,
     logger = require("core/logger").logger("deserializer"),
     Promise = require("core/promise").Promise;
 
+// By rebinding eval to a new name, it loses its ability to
+// capture the calling scope.
+var globalEval = eval;
+
 /**
  @class module:montage/core/deserializer.Deserializer
  @extends module:montage/core/core.Montage
  */
 var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deserializer.Deserializer# */ {
+    _MONTAGE_ID_ATTRIBUTE: {value: "data-montage-id"},
+
     _objects: {value: null},
    /**
   @private
@@ -51,6 +57,13 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
 /**
   @private
 */
+
+    /**
+      @private
+    */
+    // list of ids that were just created for optimization
+    _optimizedIds: {value: {}},
+
     _indexedDeserializationUnits: {value: {}},
 
     __sharedDocument: {
@@ -365,6 +378,27 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         this._compileAndDeserialize();
         return this._compiledDeserializationFunctionString;
     }},
+
+    /**
+     * Optimizes the current serialization for a specific document.
+     * @function
+     * @param {Document} doc The document to optimize against, this document can be modified during optimization.
+    */
+    optimizeForDocument: {
+        value: function(doc) {
+            var idAttributeName = Deserializer._MONTAGE_ID_ATTRIBUTE,
+                elements = doc.querySelectorAll('*[' + idAttributeName + ']'),
+                ids = this._optimizedIds = {};
+
+            for (var i = 0, element; (element = elements[i]); i++) {
+                if (!element.id) {
+                    var attribute = element.getAttribute(idAttributeName);
+                    element.setAttribute("id", ids[attribute] = "_" + idAttributeName + "_" + attribute);
+                }
+            }
+        }
+    },
+
 /**
   @private
 */
@@ -374,9 +408,12 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
             exportsStrings = "",
             unitsStrings = "",
             objectsStrings = "",
+            cleanupStrings = "",
             valueString,
             exports = {},
             modules = this._modules,
+            idsToRemove = [],
+            optimizedIds = this._optimizedIds,
             requireStrings = [],
             objectNamesCounter = {},
             label;
@@ -408,8 +445,17 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
             }
         }
 
-        this._compiledDeserializationFunctionString = "(function() {\n" + requireStrings.join("\n") + "\nreturn function(element) {\nvar exports = {};\n" + exportsStrings + "\n\n" + objectsStrings + "\n\n" + unitsStrings + "\nreturn exports;\n}}).call(this)";
-        //console.log(this._compiledDeserializationFunctionString);
+        if (idsToRemove.length > 0) {
+            cleanupStrings = 'element.getElementById("' + idsToRemove.join('").removeAttribute("id");\nelement.getElementById("') + '").removeAttribute("id");';
+            for (var i = 0, id; (id = idsToRemove[i]); i++) {
+                element.getElementById(idsToRemove[i]).removeAttribute("id");
+            }
+        }
+
+        this._compiledDeserializationFunctionString = "(function() {\n" + requireStrings.join("\n") + "\nreturn function(element) {\nvar exports = {};\n" + exportsStrings + "\n\n" + objectsStrings + "\n\n" + unitsStrings + "\n\n" + cleanupStrings + "\nreturn exports;\n}}).call(this)";
+        if (logger.isDebug) {
+            logger.debug(this._compiledDeserializationFunctionString);
+        }
 
         this._serialization = serialization = null;
 
@@ -490,7 +536,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri