Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

71 files changed, 6979 insertions, 2736 deletions

diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json
index 8e780954..0dd7714e 100644
--- a/node_modules/components-data/textarea.json
+++ b/node_modules/components-data/textarea.json
@@ -3,7 +3,7 @@
 
     "module": "montage/ui/textarea.reel",
 
-    "name": "TextArea",
+    "name": "Textarea",
 
     "properties": [
 
diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index 7e812235..b8ed5618 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -98,6 +98,26 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
     }},
 
     /**
+     Initializes the deserializer with a string
+     @param {String|Object} serialization A string or JSON-style object
+     describing the serialized objects.
+     @param {Function} require The module loader for the containing package.
+     @param {String} origin Usually a file name.
+     */
+    init: {
+        value: function (serialization, require, origin) {
+            if (typeof serialization !== "string") {
+                serialization = JSON.stringify(serialization);
+            }
+            this._reset();
+            this._serializationString = serialization;
+            this._require = require;
+            this._origin = origin;
+            return this;
+        }
+    },
+
+    /**
      Initializes the deserializer with a string of serialized objects.
      @function
      @param {String} string A string of serialized objects.
@@ -122,6 +142,14 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
         return this;
     }},
 
+    initWithObjectAndRequire: {value: function(string, require, origin) {
+        this._reset();
+        this._serializationString = JSON.stringify(object);
+        this._require = require;
+        this._origin = origin;
+        return this;
+    }},
+
     /**
      Initializes the deserializer object with a serialization string and the require object used to load the modules containing the object's prototypes.
      @function
@@ -168,8 +196,37 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
 
         return objectsArray;
     }},
+
+    chainDeserializer: {
+        value: function(deserializer) {
+            var chainedSerializations = this._chainedSerializations,
+                optimizedIds, chainedOptimizedIds;
+
+            if (!chainedSerializations) {
+                this._chainedSerializations = chainedSerializations = [];
+            }
+
+            chainedSerializations.push({
+                string: deserializer._serializationString,
+                compiledFunction: deserializer._compiledDeserializationFunction,
+                compiledFunctionString: deserializer._compiledDeserializationFunctionString
+            });
+
+            // need to copy the optimized ids too, ideally all chained templates are optimized for the same document
+            chainedOptimizedIds = deserializer._optimizedIds;
+            if (chainedOptimizedIds) {
+                if (!optimizedIds) {
+                    this._optimizedIds = optimizedIds = {};
+                }
+                for (var id in chainedOptimizedIds) {
+                    optimizedIds[id] = chainedOptimizedIds[id];
+                }
+            }
+        }