ember-source 2.13.0.beta.2 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adebb729a7b1e665e58827c245a8a03135d367d9
-  data.tar.gz: c0a8ff0c54bc92d9a54b52ea2fda964ef250e288
+  metadata.gz: 126489e5fff8c7bb47484e4ba478cc89aace5d64
+  data.tar.gz: 0d0d3403da92f6718fb1bde48e31d9d284a258f1
 SHA512:
-  metadata.gz: e3baa295b791f8414cfc16fc021ac323624f0cc711aeaee080568f24942749c27c33c15aa120d744de4561a09854c5a8395d6c6056642af3310df710d94a50f2
-  data.tar.gz: f15862869d6e89df85f219e2b0a111f9fa98edf9dc8131666885b858cbec7e16f74b3dd26913f4bc393a24649227e6c41ee49f4e28091f4cbd8aa09c1fe94049
+  metadata.gz: ecf2af5317e6f2f93feda7ff8f7c6b0213f9ad7d6c7ef7ef89cec8f2a62faa9712b4da367822b5f93dccd26b7e27aa67a631d924fc5afe8bd8934c31e7467afa
+  data.tar.gz: 28794f5c5063490d1e2163f9b894777f2d17cf5f70e36f73782b5c2c3b731af05b447b34edca9f9ee23ad95f65750bd19e6c80aca6b38821a38acc5a73634b9e

data/VERSION

@@ -1 +1 @@
-2.13.0.beta.2
+2.13.0

data/dist/ember-runtime.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.13.0-beta.2
+ * @version   2.13.0
  */
 
 var enifed, requireModule, Ember;
@@ -1869,6 +1869,8 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
       var cacheable = !areInjectionsDynamic(injections) && !areInjectionsDynamic(factoryInjections);
 
       factoryInjections[_emberUtils.NAME_KEY] = registry.makeToString(factory, fullName);
+      injections._debugContainerKey = fullName;
+      _emberUtils.setOwner(injections, container.owner);
 
       var injectedFactory = factory.extend(injections);
 
@@ -1894,9 +1896,6 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
     var type = splitName[0];
 
     var injections = buildInjections(container, registry.getTypeInjections(type), registry.getInjections(fullName));
-    injections._debugContainerKey = fullName;
-
-    _emberUtils.setOwner(injections, container.owner);
 
     return injections;
   }
@@ -1940,6 +1939,7 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
         // to create time injections
         // TODO: support new'ing for instantiation and merge injections for pure JS Functions
         var injections = injectionsFor(container, fullName);
+        injections._debugContainerKey = fullName;
 
         // Ensure that a container is available to an object during instantiation.
         // TODO - remove when Ember reaches v3.0.0
@@ -1969,27 +1969,29 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
     return factoryInjections;
   }
 
+  var INJECTED_DEPRECATED_CONTAINER_DESC = {
+    configurable: true,
+    enumerable: false,
+    get: function () {
+      _emberDebug.deprecate('Using the injected `container` is deprecated. Please use the `getOwner` helper instead to access the owner of this object.', false, { id: 'ember-application.injected-container', until: '2.13.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' });
+      return this[CONTAINER_OVERRIDE] || _emberUtils.getOwner(this).__container__;
+    },
+
+    set: function (value) {
+      _emberDebug.deprecate('Providing the `container` property to ' + this + ' is deprecated. Please use `Ember.setOwner` or `owner.ownerInjection()` instead to provide an owner to the instance being created.', false, { id: 'ember-application.injected-container', until: '2.13.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' });
+
+      this[CONTAINER_OVERRIDE] = value;
+
+      return value;
+    }
+  };
+
   // TODO - remove when Ember reaches v3.0.0
   function injectDeprecatedContainer(object, container) {
     if ('container' in object) {
       return;
     }
-    Object.defineProperty(object, 'container', {
-      configurable: true,
-      enumerable: false,
-      get: function () {
-        _emberDebug.deprecate('Using the injected `container` is deprecated. Please use the `getOwner` helper instead to access the owner of this object.', false, { id: 'ember-application.injected-container', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' });
-        return this[CONTAINER_OVERRIDE] || container;
-      },
-
-      set: function (value) {
-        _emberDebug.deprecate('Providing the `container` property to ' + this + ' is deprecated. Please use `Ember.setOwner` or `owner.ownerInjection()` instead to provide an owner to the instance being created.', false, { id: 'ember-application.injected-container', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access' });
-
-        this[CONTAINER_OVERRIDE] = value;
-
-        return value;
-      }
-    });
+    Object.defineProperty(object, 'container', INJECTED_DEPRECATED_CONTAINER_DESC);
   }
 
   function destroyDestroyables(container) {
@@ -2043,7 +2045,7 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
     return function () {
       _emberDebug.deprecate('Using the injected `container` is deprecated. Please use the `getOwner` helper to access the owner of this object and then call `' + ownerProperty + '` instead.', false, {
         id: 'ember-application.injected-container',
-        until: '3.0.0',
+        until: '2.13.0',
         url: 'http://emberjs.com/deprecations/v2.x#toc_injected-container-access'
       });
       return container[containerProperty].apply(container, arguments);
@@ -2069,6 +2071,7 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
   var FactoryManager = (function () {
     function FactoryManager(container, factory, fullName, normalizedName) {
       this.container = container;
+      this.owner = container.owner;
       this.class = factory;
       this.fullName = fullName;
       this.normalizedName = normalizedName;
@@ -2076,6 +2079,14 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
       this.injections = undefined;
     }
 
+    FactoryManager.prototype.toString = function toString() {
+      if (!this.madeToString) {
+        this.madeToString = this.container.registry.makeToString(this.class, this.fullName);
+      }
+
+      return this.madeToString;
+    };
+
     FactoryManager.prototype.create = function create() {
       var _this = this;
 
@@ -2090,8 +2101,6 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
       }
       var props = _emberUtils.assign({}, injections, options);
 
-      props[_emberUtils.NAME_KEY] = this.madeToString || (this.madeToString = this.container.registry.makeToString(this.class, this.fullName));
-
       _emberDebug.runInDebug(function () {
         var lazyInjections = undefined;
         var validationCache = _this.container.validationCache;
@@ -2115,6 +2124,21 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
         injectDeprecatedContainer(prototype, this.container);
       }
 
+      // required to allow access to things like
+      // the customized toString, _debugContainerKey,
+      // owner, etc. without a double extend and without
+      // modifying the objects properties
+      if (typeof this.class._initFactory === 'function') {
+        this.class._initFactory(this);
+      } else {
+        // in the non-Ember.Object case we need to still setOwner
+        // this is required for supporting glimmer environment and
+        // template instantiation which rely heavily on
+        // `options[OWNER]` being passed into `create`
+        // TODO: clean this up, and remove in future versions
+        _emberUtils.setOwner(props, this.owner);
+      }
+
       return this.class.create(props);
     };
 
@@ -4308,22 +4332,16 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       }
   }
 
-  function finishChains(obj) {
-    // We only create meta if we really have to
-    var m = _emberMetalMeta.peekMeta(obj);
-    if (m !== undefined) {
-      m = _emberMetalMeta.meta(obj);
-
-      // finish any current chains node watchers that reference obj
-      var chainWatchers = m.readableChainWatchers();
-      if (chainWatchers !== undefined) {
-        chainWatchers.revalidateAll();
-      }
-      // ensure that if we have inherited any chains they have been
-      // copied onto our own meta.
-      if (m.readableChains() !== undefined) {
-        m.writableChains(_emberMetalWatch_path.makeChainNode);
-      }
+  function finishChains(meta) {
+    // finish any current chains node watchers that reference obj
+    var chainWatchers = meta.readableChainWatchers();
+    if (chainWatchers !== undefined) {
+      chainWatchers.revalidateAll();
+    }
+    // ensure that if we have inherited any chains they have been
+    // copied onto our own meta.
+    if (meta.readableChains() !== undefined) {
+      meta.writableChains(_emberMetalWatch_path.makeChainNode);
     }
   }
 
@@ -5089,7 +5107,7 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-debug'],
     var stack = error.stack;
     var message = error.message;
 
-    if (stack && !stack.includes(message)) {
+    if (stack && stack.indexOf(message) === -1) {
       stack = message + '\n' + stack;
     }
 
@@ -5682,6 +5700,7 @@ enifed('ember-metal/index', ['exports', 'ember-metal/core', 'ember-metal/compute
   exports.PROPERTY_DID_CHANGE = _emberMetalProperty_events.PROPERTY_DID_CHANGE;
   exports.defineProperty = _emberMetalProperties.defineProperty;
   exports.Descriptor = _emberMetalProperties.Descriptor;
+  exports._hasCachedComputedProperties = _emberMetalProperties._hasCachedComputedProperties;
   exports.watchKey = _emberMetalWatch_key.watchKey;
   exports.unwatchKey = _emberMetalWatch_key.unwatchKey;
   exports.ChainNode = _emberMetalChains.ChainNode;
@@ -6938,6 +6957,7 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/meta_listener
       this._chains = undefined;
       this._tag = undefined;
       this._tags = undefined;
+      this._factory = undefined;
 
       // initial value for all flags right now is false
       // see FLAGS const for detailed list of flags used
@@ -7186,6 +7206,15 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/meta_listener
       }
     };
 
+    babelHelpers.createClass(Meta, [{
+      key: 'factory',
+      set: function (factory) {
+        this._factory = factory;
+      },
+      get: function () {
+        return this._factory;
+      }
+    }]);
     return Meta;
   })();
 
@@ -8849,6 +8878,7 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
   exports.DEFAULT_GETTER_FUNCTION = DEFAULT_GETTER_FUNCTION;
   exports.INHERITING_GETTER_FUNCTION = INHERITING_GETTER_FUNCTION;
   exports.defineProperty = defineProperty;
+  exports._hasCachedComputedProperties = _hasCachedComputedProperties;
 
   // ..........................................................
   // DESCRIPTOR
@@ -8971,24 +9001,20 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
   */
 
   function defineProperty(obj, keyName, desc, data, meta) {
-    var possibleDesc = undefined,
-        existingDesc = undefined,
-        watching = undefined,
-        value = undefined;
-
     if (!meta) {
       meta = _emberMetalMeta.meta(obj);
     }
     var watchEntry = meta.peekWatching(keyName);
-    possibleDesc = obj[keyName];
-    existingDesc = possibleDesc !== null && typeof possibleDesc === 'object' && possibleDesc.isDescriptor ? possibleDesc : undefined;
+    var possibleDesc = obj[keyName];
+    var existingDesc = possibleDesc !== null && typeof possibleDesc === 'object' && possibleDesc.isDescriptor ? possibleDesc : undefined;
 
-    watching = watchEntry !== undefined && watchEntry > 0;
+    var watching = watchEntry !== undefined && watchEntry > 0;
 
     if (existingDesc) {
       existingDesc.teardown(obj, keyName);
     }
 
+    var value = undefined;
     if (desc instanceof Descriptor) {
       value = desc;
       if (_emberDebug.isFeatureEnabled('mandatory-setter')) {
@@ -9005,7 +9031,10 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
       } else {
         obj[keyName] = value;
       }
-      if (desc.setup) {
+
+      didDefineComputedProperty(obj.constructor);
+
+      if (typeof desc.setup === 'function') {
         desc.setup(obj, keyName);
       }
     } else {
@@ -9050,13 +9079,30 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
 
     // The `value` passed to the `didDefineProperty` hook is
     // either the descriptor or data, whichever was passed.
-    if (obj.didDefineProperty) {
+    if (typeof obj.didDefineProperty === 'function') {
       obj.didDefineProperty(obj, keyName, value);
     }
 
     return this;
   }
 
+  var hasCachedComputedProperties = false;
+
+  function _hasCachedComputedProperties() {
+    hasCachedComputedProperties = true;
+  }
+
+  function didDefineComputedProperty(constructor) {
+    if (hasCachedComputedProperties === false) {
+      return;
+    }
+    var cache = _emberMetalMeta.meta(constructor).readableCache();
+
+    if (cache && cache._computedProperties !== undefined) {
+      cache._computedProperties = undefined;
+    }
+  }
+
   function handleBrokenPhantomDefineProperty(obj, keyName, desc) {
     // https://github.com/ariya/phantomjs/issues/11856
     Object.defineProperty(obj, keyName, { configurable: true, writable: true, value: 'iCry' });
@@ -17832,7 +17878,6 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
   var applyMixin = _emberMetal.Mixin._apply;
   var finishPartial = _emberMetal.Mixin.finishPartial;
   var reopen = _emberMetal.Mixin.prototype.reopen;
-  var hasCachedComputedProperties = false;
 
   var POST_INIT = _emberUtils.symbol('POST_INIT');
 
@@ -17843,7 +17888,8 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
     // possible.
 
     var wasApplied = false;
-    var initProperties = undefined;
+    var initProperties = undefined,
+        initFactory = undefined;
 
     var Class = (function () {
       function Class() {
@@ -17859,6 +17905,11 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
         var m = _emberMetal.meta(this);
         var proto = m.proto;
         m.proto = this;
+
+        if (initFactory) {
+          m.factory = initFactory;
+          initFactory = null;
+        }
         if (initProperties) {
           // capture locally so we can clear the closed over variable
           var props = initProperties;
@@ -17940,7 +17991,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
         this[POST_INIT]();
 
         m.proto = proto;
-        _emberMetal.finishChains(this);
+        _emberMetal.finishChains(m);
         _emberMetal.sendEvent(this, 'init');
       }
 
@@ -17956,6 +18007,10 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
         initProperties = args;
       };
 
+      Class._initFactory = function _initFactory(factory) {
+        initFactory = factory;
+      };
+
       Class.proto = function proto() {
         var superclass = Class.superclass;
         if (superclass) {
@@ -18078,7 +18133,8 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
   }, _Mixin$create.toString = function () {
     var hasToStringExtension = typeof this.toStringExtension === 'function';
     var extension = hasToStringExtension ? ':' + this.toStringExtension() : '';
-    var ret = '<' + (this[_emberUtils.NAME_KEY] || this.constructor.toString()) + ':' + _emberUtils.guidFor(this) + extension + '>';
+
+    var ret = '<' + (this[_emberUtils.NAME_KEY] || _emberMetal.meta(this).factory || this.constructor.toString()) + ':' + _emberUtils.guidFor(this) + extension + '>';
 
     return ret;
   }, _Mixin$create));
@@ -18157,7 +18213,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
     _emberDebug.assert('metaForProperty() could not find a computed property with key \'' + key + '\'.', !!desc && desc instanceof _emberMetal.ComputedProperty);
     return desc._meta || {};
   }, _ClassMixinProps._computedProperties = _emberMetal.computed(function () {
-    hasCachedComputedProperties = true;
+    _emberMetal._hasCachedComputedProperties();
     var proto = this.proto();
     var property = undefined;
     var properties = [];
@@ -18229,22 +18285,6 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
   CoreObject.ClassMixin = ClassMixin;
 
   ClassMixin.apply(CoreObject);
-
-  CoreObject.reopen({
-    didDefineProperty: function (proto, key, value) {
-      if (hasCachedComputedProperties === false) {
-        return;
-      }
-      if (value instanceof _emberMetal.ComputedProperty) {
-        var cache = _emberMetal.meta(this.constructor).readableCache();
-
-        if (cache && cache._computedProperties !== undefined) {
-          cache._computedProperties = undefined;
-        }
-      }
-    }
-  });
-
   exports.default = CoreObject;
 });
 // Private, and only for didInitAttrs willRecieveAttrs
@@ -19237,6 +19277,11 @@ enifed('ember-runtime/system/object', ['exports', 'ember-utils', 'ember-metal',
 
   'use strict';
 
+  var _CoreObject$extend;
+
+  var OVERRIDE_CONTAINER_KEY = _emberUtils.symbol('OVERRIDE_CONTAINER_KEY');
+  var OVERRIDE_OWNER = _emberUtils.symbol('OVERRIDE_OWNER');
+
   /**
     `Ember.Object` is the main base class for all Ember objects. It is a subclass
     of `Ember.CoreObject` with the `Ember.Observable` mixin applied. For details,
@@ -19248,7 +19293,47 @@ enifed('ember-runtime/system/object', ['exports', 'ember-utils', 'ember-metal',
     @uses Ember.Observable
     @public
   */
-  var EmberObject = _emberRuntimeSystemCore_object.default.extend(_emberRuntimeMixinsObservable.default);
+  var EmberObject = _emberRuntimeSystemCore_object.default.extend(_emberRuntimeMixinsObservable.default, (_CoreObject$extend = {
+    _debugContainerKey: _emberMetal.descriptor({
+      enumerable: false,
+      get: function () {
+        if (this[OVERRIDE_CONTAINER_KEY]) {
+          return this[OVERRIDE_CONTAINER_KEY];
+        }
+
+        var meta = _emberMetal.meta(this);
+        var factory = meta.factory;
+
+        return factory && factory.fullName;
+      },
+
+      // we need a setter here largely to support the legacy
+      // `owner._lookupFactory` and its double extend
+      set: function (value) {
+        this[OVERRIDE_CONTAINER_KEY] = value;
+      }
+    })
+
+  }, _CoreObject$extend[_emberUtils.OWNER] = _emberMetal.descriptor({
+    enumerable: false,
+    get: function () {
+      if (this[OVERRIDE_OWNER]) {
+        return this[OVERRIDE_OWNER];
+      }
+
+      var meta = _emberMetal.meta(this);
+      var factory = meta.factory;
+
+      return factory && factory.owner;
+    },
+
+    // we need a setter here largely to support the legacy
+    // `owner._lookupFactory` and its double extend
+    set: function (value) {
+      this[OVERRIDE_OWNER] = value;
+    }
+  }), _CoreObject$extend));
+
   EmberObject.toString = function () {
     return 'Ember.Object';
   };
@@ -19865,7 +19950,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.13.0-beta.2";
+  exports.default = "2.13.0";
 });
 enifed('rsvp', ['exports'], function (exports) {
   'use strict';