1 files changed, 49 insertions, 551 deletions

diff --git a/node_modules/montage/core/core.js b/node_modules/montage/core/core.js
index 8fcf7977..80597dce 100755
--- a/node_modules/montage/core/core.js
+++ b/node_modules/montage/core/core.js
@@ -10,7 +10,11 @@
  @requires montage/core/event/binding
  @requires montage/core/event/event-manager
  */
-require("core/shim");
+require("core/shim/object");
+require("core/shim/array");
+require("core/extras/object");
+require("core/extras/array");
+require("core/extras/string");
 
 var ATTRIBUTE_PROPERTIES = "AttributeProperties",
     UNDERSCORE = "_",
@@ -20,32 +24,20 @@ var ATTRIBUTE_PROPERTIES = "AttributeProperties",
     SERIALIZABLE = "serializable",
     MODIFY = "modify";
 
-
-
 /**
- @external Object
+ @private
  */
+var Array_prototype = Array.prototype;
 
-/* Ecmascript 5 Methods. Should be external as WebKit doesn't need it, and loaded automatically */
-if (!Object.create) {
-    Object._creator = function _ObjectCreator() {
-        this.__proto__ = _ObjectCreator.prototype;
-    };
-    Object.create = function(o, properties) {
-        this._creator.prototype = o || Object.prototype;
-        //Still needs to add properties....
-        return new this._creator;
-    };
-
-    Object.getPrototypeOf = function(o) {
-        return o.__proto__;
-    };
-}
+/**
+ @private
+ */
+var Object_prototype = Object.prototype;
 
 /**
  @class module:montage/core/core.Montage
  */
-var M = exports.Montage = Object.create(Object.prototype);
+var Montage = exports.Montage = {};
 
 /**
      Creates a new Montage object.
@@ -64,7 +56,7 @@ var M = exports.Montage = Object.create(Object.prototype);
         }
      });
      */
-Object.defineProperty(M, "create", {
+Object.defineProperty(Montage, "create", {
     configurable: true,
     value: function(aPrototype, propertyDescriptor) {
         if (!propertyDescriptor) {
@@ -82,7 +74,7 @@ Object.defineProperty(M, "create", {
             return newObject;
         } else {
             var result = Object.create(aPrototype);
-            M.defineProperties(result, propertyDescriptor);
+            Montage.defineProperties(result, propertyDescriptor);
             return result;
         }
     }
@@ -117,7 +109,7 @@ extendedPropertyAttributes.forEach(function(name) {
      writable: true
      });
      */
-Object.defineProperty(M, "defineProperty", {
+Object.defineProperty(Montage, "defineProperty", {
 
     value: function(obj, prop, descriptor) {
         var dependencies = descriptor.dependencies;
@@ -151,7 +143,7 @@ Object.defineProperty(M, "defineProperty", {
                 independentProperty;
 
             for (; (independentProperty = dependencies[i]); i++) {
-                M.addDependencyToProperty(obj, independentProperty, prop);
+                Montage.addDependencyToProperty(obj, independentProperty, prop);
             }
 
         }
@@ -167,14 +159,14 @@ Object.defineProperty(M, "defineProperty", {
 
         //this is added to enable value properties with [] or Objects that are new for every instance
         if (descriptor.distinct === true && typeof descriptor.value === "object") {
-            (function(internalProperty, value) {
+            (function(prop,internalProperty, value, obj) {
                 Object.defineProperty(obj, internalProperty, {
                     enumerable: false,
                     configurable: true,
                     writable: true,
                     value: null
                 });
-                if (value.constructor === Object && Object.getPrototypeOf(value) === Object.prototype) {
+                if (value.constructor === Object && Object.getPrototypeOf(value) === Object_prototype) {
                     // we have an object literal {...}
                     if (Object.keys(value).length !== 0) {
                         Object.defineProperty(obj, prop, {
@@ -208,7 +200,7 @@ Object.defineProperty(M, "defineProperty", {
                         });
                     }
 
-                } else if ((value.__proto__ || Object.getPrototypeOf(value)) === __cached__arrayProto) {
+                } else if ((value.__proto__ || Object.getPrototypeOf(value)) === Array_prototype) {
                     // we have an array literal [...]
                     if (value.length !== 0) {
                         Object.defineProperty(obj, prop, {
@@ -236,7 +228,7 @@ Object.defineProperty(M, "defineProperty", {
                             configurable: true,
                             get: function() {
                                 //Special case for array as isArray fails
-                                //Object.prototype.toString.call(Object.create([].__proto)) !== "[object Array]"
+                                //Object_prototype.toString.call(Object.create([].__proto)) !== "[object Array]"
                                 return this[internalProperty] || (this[internalProperty] = []);
                             },
                             set: function(value) {
@@ -278,7 +270,7 @@ Object.defineProperty(M, "defineProperty", {
                         }
                     });
                 }
-            })(UNDERSCORE + prop, descriptor.value);
+            })(prop, UNDERSCORE + prop, descriptor.value, obj);
 
         } else {
             return Object.defineProperty(obj, prop, descriptor);
@@ -291,11 +283,10 @@ Object.defineProperty(M, "defineProperty", {
      @param {Object} obj The object to which the properties are added.
      @param {Object} properties An object that contains one or more property descriptor objects.
      */
-Object.defineProperty(M, "defineProperties", {value: function(obj, properties) {
-
-    for (var p in properties) {
-        if ("_bindingDescriptors" !== p) {
-            this.defineProperty(obj, p, properties[p]);
+Object.defineProperty(Montage, "defineProperties", {value: function(obj, properties) {
+    for (var property in properties) {
+        if ("_bindingDescriptors" !== property) {
+            this.defineProperty(obj, property, properties[property]);
         }
     }
     return obj;
@@ -327,34 +318,6 @@ var _defaultFunctionValueProperty = {
 };
 
 /**
- @private
- */
-var __cached__arrayProto = Array.prototype;
-
-/**
-     Private collection of dependencies for all dependent keys. The collection here is keyed by the dependent propertyName
-     The array for each dependent property has all the independent property names that when changed, need to signal a change in the dependent property.
-     @private
-     */
-Object.defineProperty(Object.prototype, "_dependenciesForProperty", {
-    enumerable: false,
-    writable: true,
-    value: null
-});
-
- /**
-     Private collection of listener functions that are for dependent properties to observe their dependency properties for changes.
-     The collection here is keyed by the dependent propertyName.
-     @private
-     */
-Object.defineProperty(Object.prototype, "_dependencyListeners", /** @lends external:Object# */ {
-    enumerable: false,
-    writable: true,
-    value: null
-});
-
-
-/**
      Adds a dependent property to another property's collection of dependencies.
      When the value of a dependent property changes, it generates a <code>change@independentProperty</code> event.
      @function module:montage/core/core.Montage.addDependencyToProperty
@@ -362,7 +325,7 @@ Object.defineProperty(Object.prototype, "_dependencyListeners", /** @lends exter
      @param {String} independentProperty The name of the object's independent property.
      @param {String} dependentProperty The name of the object's dependent property.
      */
-M.defineProperty(M, "addDependencyToProperty", { value: function(obj, independentProperty, dependentProperty) {
+Montage.defineProperty(Montage, "addDependencyToProperty", { value: function(obj, independentProperty, dependentProperty) {
 
     // TODO optimize this so we don't keep checking over and over again
     if (!obj._dependenciesForProperty) {
@@ -385,7 +348,7 @@ M.defineProperty(M, "addDependencyToProperty", { value: function(obj, independen
      @param {String} independentProperty The name of the object's independent property.
      @param {String} dependentProperty The name of the object's dependent property that you want to remove.
      */