ember-source 2.13.0.beta.1 → 2.13.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e8bdcca54e82efd558a7746c80ecaf25ee143e
-  data.tar.gz: 52a17ef3b165c8d06a7ebd8d4e1d86e0a03287c0
+  metadata.gz: adebb729a7b1e665e58827c245a8a03135d367d9
+  data.tar.gz: c0a8ff0c54bc92d9a54b52ea2fda964ef250e288
 SHA512:
-  metadata.gz: 38d2ea2e2018e5671d033ea777aacd6ffebedb3ecc9a08df7a74f4b5d32c76bcb8df5859e56d9c5e0570004161401526b6702bfb75f0577b3cc763306e56b3de
-  data.tar.gz: fd7a7b9367cfd21703063c44e4da29b9f26ec9b14e9a3caa512bedca5a4b23f8da60903b734353ae438cf67ef3abcf61c92daf473e2de086eacbdff8ef9b7972
+  metadata.gz: e3baa295b791f8414cfc16fc021ac323624f0cc711aeaee080568f24942749c27c33c15aa120d744de4561a09854c5a8395d6c6056642af3310df710d94a50f2
+  data.tar.gz: f15862869d6e89df85f219e2b0a111f9fa98edf9dc8131666885b858cbec7e16f74b3dd26913f4bc393a24649227e6c41ee49f4e28091f4cbd8aa09c1fe94049

data/VERSION

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

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.1
+ * @version   2.13.0-beta.2
  */
 
 var enifed, requireModule, Ember;
@@ -2073,6 +2073,7 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
       this.fullName = fullName;
       this.normalizedName = normalizedName;
       this.madeToString = undefined;
+      this.injections = undefined;
     }
 
     FactoryManager.prototype.create = function create() {
@@ -2080,7 +2081,13 @@ enifed('container/container', ['exports', 'ember-debug', 'ember-utils', 'ember-e
 
       var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
 
-      var injections = injectionsFor(this.container, this.normalizedName);
+      var injections = this.injections;
+      if (injections === undefined) {
+        injections = injectionsFor(this.container, this.normalizedName);
+        if (areInjectionsDynamic(injections) === false) {
+          this.injections = injections;
+        }
+      }
       var props = _emberUtils.assign({}, injections, options);
 
       props[_emberUtils.NAME_KEY] = this.madeToString || (this.madeToString = this.container.registry.makeToString(this.class, this.fullName));
@@ -4094,18 +4101,18 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       // It is false for the root of a chain (because we have no parent)
       // and for global paths (because the parent node is the object with
       // the observer on it)
-      this._watching = value === undefined;
+      var isWatching = this._watching = value === undefined;
 
       this._chains = undefined;
       this._object = undefined;
       this.count = 0;
 
       this._value = value;
-      this._paths = {};
-      if (this._watching) {
+      this._paths = undefined;
+      if (isWatching === true) {
         var obj = parent.value();
 
-        if (!isObject(obj)) {
+        if (!isObject(obj) === true) {
           return;
         }
 
@@ -4116,7 +4123,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     }
 
     ChainNode.prototype.value = function value() {
-      if (this._value === undefined && this._watching) {
+      if (this._value === undefined && this._watching === true) {
         var obj = this._parent.value();
         this._value = lazyGet(obj, this._key);
       }
@@ -4124,7 +4131,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     };
 
     ChainNode.prototype.destroy = function destroy() {
-      if (this._watching) {
+      if (this._watching === true) {
         var obj = this._object;
         if (obj) {
           removeChainWatcher(obj, this._key, this);
@@ -4139,13 +4146,14 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       var ret = new ChainNode(null, null, obj);
       var paths = this._paths;
       var path = undefined;
-
-      for (path in paths) {
-        // this check will also catch non-number vals.
-        if (paths[path] <= 0) {
-          continue;
+      if (paths !== undefined) {
+        for (path in paths) {
+          // this check will also catch non-number vals.
+          if (paths[path] <= 0) {
+            continue;
+          }
+          ret.add(path);
         }
-        ret.add(path);
       }
       return ret;
     };
@@ -4154,7 +4162,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     // path.
 
     ChainNode.prototype.add = function add(path) {
-      var paths = this._paths;
+      var paths = this._paths || (this._paths = {});
       paths[path] = (paths[path] || 0) + 1;
 
       var key = firstKey(path);
@@ -4168,6 +4176,9 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
 
     ChainNode.prototype.remove = function remove(path) {
       var paths = this._paths;
+      if (paths === undefined) {
+        return;
+      }
       if (paths[path] > 0) {
         paths[path]--;
       }
@@ -4221,11 +4232,11 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     };
 
     ChainNode.prototype.notify = function notify(revalidate, affected) {
-      if (revalidate && this._watching) {
+      if (revalidate && this._watching === true) {
         var parentValue = this._parent.value();
 
         if (parentValue !== this._object) {
-          if (this._object) {
+          if (this._object !== undefined) {
             removeChainWatcher(this._object, this._key, this);
           }
 
@@ -4242,7 +4253,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       // then notify chains...
       var chains = this._chains;
       var node = undefined;
-      if (chains) {
+      if (chains !== undefined) {
         for (var key in chains) {
           node = chains[key];
           if (node !== undefined) {
@@ -4281,12 +4292,12 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     var meta = _emberMetalMeta.peekMeta(obj);
 
     // check if object meant only to be a prototype
-    if (meta && meta.proto === obj) {
+    if (meta !== undefined && meta.proto === obj) {
       return;
     }
 
     // Use `get` if the return value is an EachProxy or an uncacheable value.
-    if (isVolatile(obj[key])) {
+    if (isVolatile(obj[key]) === true) {
       return _emberMetalProperty_get.get(obj, key);
       // Otherwise attempt to get the cached value of the computed property
     } else {
@@ -4300,17 +4311,17 @@ 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) {
+    if (m !== undefined) {
       m = _emberMetalMeta.meta(obj);
 
       // finish any current chains node watchers that reference obj
       var chainWatchers = m.readableChainWatchers();
-      if (chainWatchers) {
+      if (chainWatchers !== undefined) {
         chainWatchers.revalidateAll();
       }
       // ensure that if we have inherited any chains they have been
       // copied onto our own meta.
-      if (m.readableChains()) {
+      if (m.readableChains() !== undefined) {
         m.writableChains(_emberMetalWatch_path.makeChainNode);
       }
     }
@@ -5186,6 +5197,9 @@ enifed('ember-metal/events', ['exports', 'ember-utils', 'ember-metal/meta', 'emb
       return;
     }
     var actions = meta.matchingListeners(eventName);
+    if (actions === undefined) {
+      return;
+    }
     var newActions = [];
 
     for (var i = actions.length - 3; i >= 0; i -= 3) {
@@ -5403,7 +5417,8 @@ enifed('ember-metal/events', ['exports', 'ember-utils', 'ember-metal/meta', 'emb
     if (!meta) {
       return false;
     }
-    return meta.matchingListeners(eventName).length > 0;
+    var matched = meta.matchingListeners(eventName);
+    return matched !== undefined && matched.length > 0;
   }
 
   /**
@@ -5509,7 +5524,7 @@ enifed('ember-metal/expand_properties', ['exports', 'ember-debug'], function (ex
   */
 
   function expandProperties(pattern, callback) {
-    _emberDebug.assert('A computed property key must be a string', typeof pattern === 'string');
+    _emberDebug.assert('A computed property key must be a string, you passed ' + typeof pattern + ' ' + pattern, typeof pattern === 'string');
     _emberDebug.assert('Brace expanded properties cannot contain spaces, e.g. "user.{firstName, lastName}" should be "user.{firstName,lastName}"', pattern.indexOf(' ') === -1);
 
     var unbalancedNestedError = 'Brace expanded properties have to be balanced and cannot be nested, pattern: ' + pattern;
@@ -7556,23 +7571,24 @@ enifed('ember-metal/meta_listeners', ['exports'], function (exports) {
 
     matchingListeners: function (eventName) {
       var pointer = this;
-      var result = [];
-      while (pointer) {
+      var result = undefined;
+      while (pointer !== undefined) {
         var listeners = pointer._listeners;
-        if (listeners) {
+        if (listeners !== undefined) {
           for (var index = 0; index < listeners.length - 3; index += 4) {
             if (listeners[index] === eventName) {
+              result = result || [];
               pushUniqueListener(result, listeners, index);
             }
           }
         }
-        if (pointer._listenersFinalized) {
+        if (pointer._listenersFinalized === true) {
           break;
         }
         pointer = pointer.parent;
       }
       var sus = this._suspendedListeners;
-      if (sus) {
+      if (sus !== undefined && result !== undefined) {
         for (var susIndex = 0; susIndex < sus.length - 2; susIndex += 3) {
           if (eventName === sus[susIndex]) {
             for (var resultIndex = 0; resultIndex < result.length - 2; resultIndex += 3) {
@@ -19849,7 +19865,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.13.0-beta.1";
+  exports.default = "2.13.0-beta.2";
 });
 enifed('rsvp', ['exports'], function (exports) {
   'use strict';

data/dist/ember-template-compiler.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.1
+ * @version   2.13.0-beta.2
  */
 
 var enifed, requireModule, Ember;
@@ -6020,6 +6020,10 @@ enifed('ember-debug/warn', ['exports', 'ember-console', 'ember-debug/deprecate',
   */
 
   function warn(message, test, options) {
+    if (arguments.length === 2 && typeof test === 'object') {
+      options = test;
+      test = false;
+    }
     if (!options) {
       _emberDebugDeprecate.default(missingOptionsDeprecation, false, {
         id: 'ember-debug.warn-options-missing',
@@ -6036,7 +6040,7 @@ enifed('ember-debug/warn', ['exports', 'ember-console', 'ember-debug/deprecate',
       });
     }
 
-    _emberDebugHandlers.invoke.apply(undefined, ['warn'].concat(babelHelpers.slice.call(arguments)));
+    _emberDebugHandlers.invoke('warn', message, test, options);
   }
 });
 enifed('ember-environment/global', ['exports'], function (exports) {
@@ -7035,18 +7039,18 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       // It is false for the root of a chain (because we have no parent)
       // and for global paths (because the parent node is the object with
       // the observer on it)
-      this._watching = value === undefined;
+      var isWatching = this._watching = value === undefined;
 
       this._chains = undefined;
       this._object = undefined;
       this.count = 0;
 
       this._value = value;
-      this._paths = {};
-      if (this._watching) {
+      this._paths = undefined;
+      if (isWatching === true) {
         var obj = parent.value();
 
-        if (!isObject(obj)) {
+        if (!isObject(obj) === true) {
           return;
         }
 
@@ -7057,7 +7061,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     }
 
     ChainNode.prototype.value = function value() {
-      if (this._value === undefined && this._watching) {
+      if (this._value === undefined && this._watching === true) {
         var obj = this._parent.value();
         this._value = lazyGet(obj, this._key);
       }
@@ -7065,7 +7069,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     };
 
     ChainNode.prototype.destroy = function destroy() {
-      if (this._watching) {
+      if (this._watching === true) {
         var obj = this._object;
         if (obj) {
           removeChainWatcher(obj, this._key, this);
@@ -7080,13 +7084,14 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       var ret = new ChainNode(null, null, obj);
       var paths = this._paths;
       var path = undefined;
-
-      for (path in paths) {
-        // this check will also catch non-number vals.
-        if (paths[path] <= 0) {
-          continue;
+      if (paths !== undefined) {
+        for (path in paths) {
+          // this check will also catch non-number vals.
+          if (paths[path] <= 0) {
+            continue;
+          }
+          ret.add(path);
         }
-        ret.add(path);
       }
       return ret;
     };
@@ -7095,7 +7100,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     // path.
 
     ChainNode.prototype.add = function add(path) {
-      var paths = this._paths;
+      var paths = this._paths || (this._paths = {});
       paths[path] = (paths[path] || 0) + 1;
 
       var key = firstKey(path);
@@ -7109,6 +7114,9 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
 
     ChainNode.prototype.remove = function remove(path) {
       var paths = this._paths;
+      if (paths === undefined) {
+        return;
+      }
       if (paths[path] > 0) {
         paths[path]--;
       }
@@ -7162,11 +7170,11 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     };
 
     ChainNode.prototype.notify = function notify(revalidate, affected) {
-      if (revalidate && this._watching) {
+      if (revalidate && this._watching === true) {
         var parentValue = this._parent.value();
 
         if (parentValue !== this._object) {
-          if (this._object) {
+          if (this._object !== undefined) {
             removeChainWatcher(this._object, this._key, this);
           }
 
@@ -7183,7 +7191,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       // then notify chains...
       var chains = this._chains;
       var node = undefined;
-      if (chains) {
+      if (chains !== undefined) {
         for (var key in chains) {
           node = chains[key];
           if (node !== undefined) {
@@ -7222,12 +7230,12 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     var meta = _emberMetalMeta.peekMeta(obj);
 
     // check if object meant only to be a prototype
-    if (meta && meta.proto === obj) {
+    if (meta !== undefined && meta.proto === obj) {
       return;
     }
 
     // Use `get` if the return value is an EachProxy or an uncacheable value.
-    if (isVolatile(obj[key])) {
+    if (isVolatile(obj[key]) === true) {
       return _emberMetalProperty_get.get(obj, key);
       // Otherwise attempt to get the cached value of the computed property
     } else {
@@ -7241,17 +7249,17 @@ 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) {
+    if (m !== undefined) {
       m = _emberMetalMeta.meta(obj);
 
       // finish any current chains node watchers that reference obj
       var chainWatchers = m.readableChainWatchers();
-      if (chainWatchers) {
+      if (chainWatchers !== undefined) {
         chainWatchers.revalidateAll();
       }
       // ensure that if we have inherited any chains they have been
       // copied onto our own meta.
-      if (m.readableChains()) {
+      if (m.readableChains() !== undefined) {
         m.writableChains(_emberMetalWatch_path.makeChainNode);
       }
     }
@@ -8129,6 +8137,9 @@ enifed('ember-metal/events', ['exports', 'ember-utils', 'ember-metal/meta', 'emb
       return;
     }
     var actions = meta.matchingListeners(eventName);
+    if (actions === undefined) {
+      return;
+    }
     var newActions = [];
 
     for (var i = actions.length - 3; i >= 0; i -= 3) {
@@ -8346,7 +8357,8 @@ enifed('ember-metal/events', ['exports', 'ember-utils', 'ember-metal/meta', 'emb
     if (!meta) {
       return false;
     }
-    return meta.matchingListeners(eventName).length > 0;
+    var matched = meta.matchingListeners(eventName);
+    return matched !== undefined && matched.length > 0;
   }
 
   /**
@@ -8452,7 +8464,7 @@ enifed('ember-metal/expand_properties', ['exports', 'ember-debug'], function (ex
   */
 
   function expandProperties(pattern, callback) {
-    _emberDebug.assert('A computed property key must be a string', typeof pattern === 'string');
+    _emberDebug.assert('A computed property key must be a string, you passed ' + typeof pattern + ' ' + pattern, typeof pattern === 'string');
     _emberDebug.assert('Brace expanded properties cannot contain spaces, e.g. "user.{firstName, lastName}" should be "user.{firstName,lastName}"', pattern.indexOf(' ') === -1);
 
     var unbalancedNestedError = 'Brace expanded properties have to be balanced and cannot be nested, pattern: ' + pattern;
@@ -10503,23 +10515,24 @@ enifed('ember-metal/meta_listeners', ['exports'], function (exports) {
 
     matchingListeners: function (eventName) {
       var pointer = this;
-      var result = [];
-      while (pointer) {
+      var result = undefined;
+      while (pointer !== undefined) {
         var listeners = pointer._listeners;
-        if (listeners) {
+        if (listeners !== undefined) {
           for (var index = 0; index < listeners.length - 3; index += 4) {
             if (listeners[index] === eventName) {
+              result = result || [];
               pushUniqueListener(result, listeners, index);
             }
           }
         }
-        if (pointer._listenersFinalized) {
+        if (pointer._listenersFinalized === true) {
           break;
         }
         pointer = pointer.parent;
       }
       var sus = this._suspendedListeners;
-      if (sus) {
+      if (sus !== undefined && result !== undefined) {
         for (var susIndex = 0; susIndex < sus.length - 2; susIndex += 3) {
           if (eventName === sus[susIndex]) {
             for (var resultIndex = 0; resultIndex < result.length - 2; resultIndex += 3) {
@@ -16138,7 +16151,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.13.0-beta.1";
+  exports.default = "2.13.0-beta.2";
 });
 enifed("handlebars", ["exports"], function (exports) {
   /* istanbul ignore next */