Merge branch 'refs/heads/ninja-internal' into ToolFixes

48 files changed, 1994 insertions, 1565 deletions

diff --git a/node_modules/montage/bin/montage b/node_modules/montage/bin/montage
new file mode 100755
index 00000000..aaa84003
--- /dev/null
+++ b/node_modules/montage/bin/montage
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+// --harmony_weakmaps --harmony_proxies
+require("../montage.js").initMontage();
diff --git a/node_modules/montage/core/core.js b/node_modules/montage/core/core.js
index ff94f303..8fcf7977 100755
--- a/node_modules/montage/core/core.js
+++ b/node_modules/montage/core/core.js
@@ -71,14 +71,14 @@ Object.defineProperty(M, "create", {
 
             var newObject = Object.create(typeof aPrototype === "undefined" ? this : aPrototype);
 
-            if (typeof newObject.didCreate === "function") {
-                newObject.didCreate();
-            }
-
             if (newObject._dependenciesForProperty) {
                 newObject._dependencyListeners = {};
             }
 
+            if (typeof newObject.didCreate === "function") {
+                newObject.didCreate();
+            }
+
             return newObject;
         } else {
             var result = Object.create(aPrototype);
@@ -713,13 +713,17 @@ if (!Object.seal) {
  */
 Object.defineProperty(M, "callDelegateMethod", {
     value: function(name) {
-        var delegate, delegateFunctionName, delegateFunction;
+        var delegate = this.delegate, delegateFunctionName, delegateFunction;
         if (typeof this.identifier === "string") {
             delegateFunctionName = this.identifier + name.toCapitalized();
-        } else {
-            delegateFunctionName = name;
+            if (delegate && typeof (delegateFunction = delegate[delegateFunctionName]) === "function") {
+                // remove first argument
+                Array.prototype.shift.call(arguments);
+                return delegateFunction.apply(delegate, arguments);
+            }
         }
-        if ((delegate = this.delegate) && typeof (delegateFunction = delegate[delegateFunctionName]) === "function") {
+
+        if (delegate && typeof (delegateFunction = delegate[name]) === "function") {
             // remove first argument
             Array.prototype.shift.call(arguments);
             return delegateFunction.apply(delegate, arguments);
diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index 0abc924b..7e812235 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/node_modules/montage/core/deserializer.js
@@ -18,6 +18,14 @@ var Montage = require("montage").Montage,
 // By rebinding eval to a new name, it loses its ability to
 // capture the calling scope.
 var globalEval = eval;
+var canEval = true;
+
+// CSP doesn't let you eval
+try {
+    eval("");
+} catch(ex) {
+    canEval = false;
+}
 
 /**
  @class module:montage/core/deserializer.Deserializer
@@ -81,6 +89,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
     _reset: {value: function() {
         this._serializationString = null;
         this._requiredModuleIds = null;
+        this._areModulesLoaded = false;
         this._parseFunction = null;
         this._serialization = null;
         this._compiledDeserializationFunction = null;
@@ -342,7 +351,12 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
             this._parseForModules();
         }
 
-        this._loadModules(this._requiredModuleIds, callback);
+        if (this._requiredModuleIds.length > 0) {
+            this._loadModules(this._requiredModuleIds, callback);
+        } else {
+            this._areModulesLoaded = true;
+            return callback();
+        }
     }},
 
     /**
@@ -356,16 +370,40 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri
 /**
   @private
 */
+    _findObjectNameRegExp: {
+        value: /([^\/]+?)(\.reel)?$/
+    },
+    _toCamelCaseRegExp: {
+        value: /(?:^|-)([^-])/g
+    },
+    _replaceToCamelCase: {
+        value: function(_, g1) { return g1.toUpperCase() }
+    },
     _parseForModules: {value: function() {
         var serialization = this._serialization,
             moduleIds = this._requiredModuleIds = [],
-            modules = this._modules;
+            modules = this._modules,
+            desc, moduleId;
 
         for (var label in serialization) {
-            var desc = serialization[label];
-            var moduleId = desc.module;
+            desc = serialization[label];
+            moduleId = null;
+
+            if ("module" in desc) {
+                moduleId = desc.module;
+            } else if (name = /*assignment*/(desc.prototype || desc.object)) {
+                objectLocation = name.split("[");
+                moduleId = objectLocation[0];
+                desc.module = moduleId;
+                if (objectLocation.length == 2) {
+                    desc.name = objectLocation[1].slice(0, -1);
+                } else {
+                    this._findObjectNameRegExp.test(moduleId);
+                    desc.name = RegExp.$1.replace(this._toCamelCaseRegExp, this._replaceToCamelCase);
+                }