ember-source 2.15.3 → 2.16.0.beta.1

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.15.3
+ * @version   2.16.0-beta.1
  */
 
 var enifed, requireModule, Ember;
@@ -4640,6 +4640,7 @@ enifed('backburner', ['exports'], function (exports) {
             this.name = name;
             this.options = options;
             this.globalOptions = globalOptions;
+            this.globalOptions.onError = getOnError(globalOptions);
         }
 
         Queue.prototype.push = function (target, method, args, stack) {
@@ -4669,13 +4670,14 @@ enifed('backburner', ['exports'], function (exports) {
             var _options = this.options,
                 before = _options.before,
                 after = _options.after,
-                onError,
                 i;
 
             var target = void 0;
             var method = void 0;
             var args = void 0;
             var errorRecordedForStack = void 0;
+            var onError = this.globalOptions.onError;
+            var invoke = onError ? this.invokeWithOnError : this.invoke;
             this.targetQueues = Object.create(null);
             var queueItems = void 0;
             if (this._queueBeingFlushed.length > 0) {
@@ -4687,39 +4689,33 @@ enifed('backburner', ['exports'], function (exports) {
             if (before) {
                 before();
             }
-            var invoke = void 0;
-            if (queueItems.length > 0) {
-                onError = getOnError(this.globalOptions);
-
-                invoke = onError ? this.invokeWithOnError : this.invoke;
-                for (i = this.index; i < queueItems.length; i += 4) {
-                    this.index += 4;
-                    target = queueItems[i];
-                    method = queueItems[i + 1];
-                    args = queueItems[i + 2];
-                    errorRecordedForStack = queueItems[i + 3]; // Debugging assistance
-                    // method could have been nullified / canceled during flush
-                    if (method !== null) {
-                        //
-                        //    ** Attention intrepid developer **
-                        //
-                        //    To find out the stack of this task when it was scheduled onto
-                        //    the run loop, add the following to your app.js:
-                        //
-                        //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
-                        //
-                        //    Once that is in place, when you are at a breakpoint and navigate
-                        //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
-                        //    which will be the captured stack when this job was scheduled.
-                        //
-                        //    One possible long-term solution is the following Chrome issue:
-                        //       https://bugs.chromium.org/p/chromium/issues/detail?id=332624
-                        //
-                        invoke(target, method, args, onError, errorRecordedForStack);
-                    }
-                    if (this.index !== this._queueBeingFlushed.length && this.globalOptions.mustYield && this.globalOptions.mustYield()) {
-                        return 1 /* Pause */;
-                    }
+            for (i = this.index; i < queueItems.length; i += 4) {
+                this.index += 4;
+                target = queueItems[i];
+                method = queueItems[i + 1];
+                args = queueItems[i + 2];
+                errorRecordedForStack = queueItems[i + 3]; // Debugging assistance
+                // method could have been nullified / canceled during flush
+                if (method !== null) {
+                    //
+                    //    ** Attention intrepid developer **
+                    //
+                    //    To find out the stack of this task when it was scheduled onto
+                    //    the run loop, add the following to your app.js:
+                    //
+                    //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
+                    //
+                    //    Once that is in place, when you are at a breakpoint and navigate
+                    //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
+                    //    which will be the captured stack when this job was scheduled.
+                    //
+                    //    One possible long-term solution is the following Chrome issue:
+                    //       https://bugs.chromium.org/p/chromium/issues/detail?id=332624
+                    //
+                    invoke(target, method, args, onError, errorRecordedForStack);
+                }
+                if (this.index !== this._queueBeingFlushed.length && this.globalOptions.mustYield && this.globalOptions.mustYield()) {
+                    return 1 /* Pause */;
                 }
             }
             if (after) {
@@ -4930,6 +4926,7 @@ enifed('backburner', ['exports'], function (exports) {
 
     // accepts a function that when invoked will return an iterator
     // iterator will drain until completion
+    // accepts a function that when invoked will return an iterator
     var iteratorDrain = function (fn) {
         var iterator = fn();
         var result = iterator.next();
@@ -4939,8 +4936,8 @@ enifed('backburner', ['exports'], function (exports) {
         }
     };
 
+    var now = Date.now;
     var noop = function () {};
-    var SET_TIMEOUT = setTimeout;
 
     var Backburner = function () {
         function Backburner(queueNames) {
@@ -4977,12 +4974,9 @@ enifed('backburner', ['exports'], function (exports) {
                 return clearTimeout(id);
             };
             platform.next = _platform.next || function (fn) {
-                return SET_TIMEOUT(fn, 0);
+                return platform.setTimeout(fn, 0);
             };
             platform.clearNext = _platform.clearNext || platform.clearTimeout;
-            platform.now = _platform.now || function () {
-                return Date.now();
-            };
             this._platform = platform;
             this._boundRunExpiredTimers = function () {
                 _this._runExpiredTimers();
@@ -5281,7 +5275,7 @@ enifed('backburner', ['exports'], function (exports) {
                 }
             }
             var onError = getOnError(this.options);
-            var executeAt = this._platform.now() + wait;
+            var executeAt = now() + wait;
             var fn = void 0;
             if (onError) {
                 fn = function () {
@@ -5501,7 +5495,7 @@ enifed('backburner', ['exports'], function (exports) {
             var l = timers.length;
             var i = 0;
             var defaultQueue = this.options.defaultQueue;
-            var n = this._platform.now();
+            var n = now();
             for (; i < l; i += 2) {
                 executeAt = timers[i];
 
@@ -5535,7 +5529,7 @@ enifed('backburner', ['exports'], function (exports) {
                 return;
             }
             var minExpiresAt = this._timers[0];
-            var n = this._platform.now();
+            var n = now();
             var wait = Math.max(0, minExpiresAt - n);
             this._timerTimeoutId = this._platform.setTimeout(this._boundRunExpiredTimers, wait);
         };
@@ -5630,19 +5624,17 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug', 'ember/features',
         expandedFullName = this.registry.expandLocalLookup(fullName, options);
         // if expandLocalLookup returns falsey, we do not support local lookup
 
-        if (_features.EMBER_MODULE_UNIFICATION) {
-          if (expandedFullName) {
-            // with ember-module-unification, if expandLocalLookup returns something,
-            // pass it to the resolve without the source
-            normalizedName = expandedFullName;
-            options = {};
-          }
-        } else {
+        if (!_features.EMBER_MODULE_UNIFICATION) {
           if (!expandedFullName) {
             return;
           }
 
           normalizedName = expandedFullName;
+        } else if (expandedFullName) {
+          // with ember-module-unification, if expandLocalLookup returns something,
+          // pass it to the resolve without the source
+          normalizedName = expandedFullName;
+          options = {};
         }
       }
 
@@ -5653,12 +5645,7 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug', 'ember/features',
         return cached;
       }
 
-      var factory = void 0;
-      if (_features.EMBER_MODULE_UNIFICATION) {
-        factory = this.registry.resolve(normalizedName, options);
-      } else {
-        factory = this.registry.resolve(normalizedName);
-      }
+      var factory = _features.EMBER_MODULE_UNIFICATION ? this.registry.resolve(normalizedName, options) : this.registry.resolve(normalizedName);
 
       if (factory === undefined) {
         return;
@@ -5727,20 +5714,18 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug', 'ember/features',
       expandedFullName = container.registry.expandLocalLookup(fullName, options);
 
 
-      if (_features.EMBER_MODULE_UNIFICATION) {
-        if (expandedFullName) {
-          // with ember-module-unification, if expandLocalLookup returns something,
-          // pass it to the resolve without the source
-          fullName = expandedFullName;
-          options = {};
-        }
-      } else {
+      if (!_features.EMBER_MODULE_UNIFICATION) {
         // if expandLocalLookup returns falsey, we do not support local lookup
         if (!expandedFullName) {
           return;
         }
 
         fullName = expandedFullName;
+      } else if (expandedFullName) {
+        // with ember-module-unification, if expandLocalLookup returns something,
+        // pass it to the resolve without the source
+        fullName = expandedFullName;
+        options = {};
       }
     }
 
@@ -5782,17 +5767,7 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug', 'ember/features',
   }
 
   function instantiateFactory(container, fullName, options) {
-
-    var factoryManager = void 0;
-    if (_features.EMBER_MODULE_UNIFICATION) {
-      if (options && options.source) {
-        factoryManager = container.factoryFor(fullName, options);
-      } else {
-        factoryManager = container.factoryFor(fullName);
-      }
-    } else {
-      factoryManager = container.factoryFor(fullName);
-    }
+    var factoryManager = _features.EMBER_MODULE_UNIFICATION && options && options.source ? container.factoryFor(fullName, options) : container.factoryFor(fullName);
 
     if (factoryManager === undefined) {
       return;
@@ -6319,11 +6294,11 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug', 'ember/features',
       return injections;
     },
     resolverCacheKey: function (name, options) {
-      if (_features.EMBER_MODULE_UNIFICATION) {
-        return options && options.source ? options.source + ':' + name : name;
-      } else {
+      if (!_features.EMBER_MODULE_UNIFICATION) {
         return name;
       }
+
+      return options && options.source ? options.source + ':' + name : name;
     }
   };
 
@@ -6413,21 +6388,19 @@ enifed('container', ['exports', 'ember-utils', 'ember-debug', 'ember/features',
       // and source into the full normalizedName
       expandedNormalizedName = registry.expandLocalLookup(normalizedName, options);
 
+      // if expandLocalLookup returns falsey, we do not support local lookup
 
-      if (_features.EMBER_MODULE_UNIFICATION) {
-        if (expandedNormalizedName) {
-          // with ember-module-unification, if expandLocalLookup returns something,
-          // pass it to the resolve without the source
-          normalizedName = expandedNormalizedName;
-          options = {};
-        }
-      } else {
-        // if expandLocalLookup returns falsey, we do not support local lookup
+      if (!_features.EMBER_MODULE_UNIFICATION) {
         if (!expandedNormalizedName) {
           return;
         }
 
         normalizedName = expandedNormalizedName;
+      } else if (expandedNormalizedName) {
+        // with ember-module-unification, if expandLocalLookup returns something,
+        // pass it to the resolve without the source
+        normalizedName = expandedNormalizedName;
+        options = {};
       }
     }
 
@@ -7859,53 +7832,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   
   */
 
-  function indexOf(array, target, method) {
-    var index = -1,
-        i;
-    // hashes are added to the end of the event array
-    // so it makes sense to start searching at the end
-    // of the array and search in reverse
-    for (i = array.length - 3; i >= 0; i -= 3) {
-      if (target === array[i] && method === array[i + 1]) {
-        index = i;
-        break;
-      }
-    }
-    return index;
-  }
-
-  function accumulateListeners(obj, eventName, otherActions) {
-    var meta$$1 = exports.peekMeta(obj),
-        i,
-        target,
-        method,
-        flags,
-        actionIndex;
-    if (!meta$$1) {
-      return;
-    }
-    var actions = meta$$1.matchingListeners(eventName);
-    if (actions === undefined) {
-      return;
-    }
-    var newActions = [];
-
-    for (i = actions.length - 3; i >= 0; i -= 3) {
-      target = actions[i];
-      method = actions[i + 1];
-      flags = actions[i + 2];
-      actionIndex = indexOf(otherActions, target, method);
-
-
-      if (actionIndex === -1) {
-        otherActions.push(target, method, flags);
-        newActions.push(target, method, flags);
-      }
-    }
-
-    return newActions;
-  }
-
   /**
     Add an event listener
   
@@ -8185,7 +8111,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     }
 
     if (propertyKey === 'content' && meta$$1.isProxy()) {
-      meta$$1.getTag().contentDidChange();
+      objectTag.contentDidChange();
     }
 
     if (objectTag !== undefined || propertyTag !== undefined) {
@@ -8193,14 +8119,14 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     }
   }
 
-  var run = void 0;
+  var backburner = void 0;
   function ensureRunloop() {
-    if (run === undefined) {
-      run = require('ember-metal').run;
+    if (backburner === undefined) {
+      backburner = require('ember-metal').run.backburner;
     }
 
     if (hasViews()) {
-      run.backburner.ensureInstance();
+      backburner.ensureInstance();
     }
   }
 
@@ -8234,12 +8160,12 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       var observers = this.observers;
       var senderGuid = emberUtils.guidFor(sender);
       var keySet = observerSet[senderGuid];
-      var index = void 0;
 
-      if (!keySet) {
+      if (keySet === undefined) {
         observerSet[senderGuid] = keySet = {};
       }
-      index = keySet[keyName];
+
+      var index = keySet[keyName];
       if (index === undefined) {
         index = observers.push({
           sender: sender,
@@ -8253,9 +8179,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     };
 
     ObserverSet.prototype.flush = function () {
-      var observers = this.observers;
-      var i = void 0,
-          observer = void 0,
+      var observers = this.observers,
+          i;
+      var observer = void 0,
           sender = void 0;
       this.clear();
       for (i = 0; i < observers.length; ++i) {
@@ -8407,7 +8333,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   */
   function propertyWillChange(obj, keyName, _meta) {
     var meta$$1 = _meta || exports.peekMeta(obj);
-
     if (meta$$1 && !meta$$1.isInitialized(obj)) {
       return;
     }
@@ -8461,11 +8386,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     }
 
     if (hasMeta && meta$$1.peekWatching(keyName) > 0) {
-      if (meta$$1.hasDeps(keyName) && !meta$$1.isSourceDestroying()) {
-        dependentKeysDidChange(obj, keyName, meta$$1);
-      }
-
-      chainsDidChange(obj, keyName, meta$$1, false);
+      dependentKeysDidChange(obj, keyName, meta$$1);
+      chainsDidChange(obj, keyName, meta$$1);
       notifyObservers(obj, keyName, meta$$1);
     }
 
@@ -8489,30 +8411,28 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   var DID_SEEN = void 0;
   // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
   function dependentKeysWillChange(obj, depKey, meta$$1) {
-    var seen, top;
-
-    if (meta$$1.isSourceDestroying()) {
+    if (meta$$1.isSourceDestroying() || !meta$$1.hasDeps(depKey)) {
       return;
     }
-    if (meta$$1.hasDeps(depKey)) {
-      seen = WILL_SEEN;
-      top = !seen;
-
+    var seen = WILL_SEEN;
+    var top = !seen;
 
-      if (top) {
-        seen = WILL_SEEN = {};
-      }
+    if (top) {
+      seen = WILL_SEEN = {};
+    }
 
-      iterDeps(propertyWillChange, obj, depKey, seen, meta$$1);
+    iterDeps(propertyWillChange, obj, depKey, seen, meta$$1);
 
-      if (top) {
-        WILL_SEEN = null;
-      }
+    if (top) {
+      WILL_SEEN = null;
     }
   }
 
   // called whenever a property has just changed to update dependent keys
   function dependentKeysDidChange(obj, depKey, meta$$1) {
+    if (meta$$1.isSourceDestroying() || !meta$$1.hasDeps(depKey)) {
+      return;
+    }
     var seen = DID_SEEN;
     var top = !seen;
 
@@ -8561,21 +8481,21 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
   function chainsWillChange(obj, keyName, meta$$1) {
     var chainWatchers = meta$$1.readableChainWatchers();
-    if (chainWatchers) {
+    if (chainWatchers !== undefined) {
       chainWatchers.notify(keyName, false, propertyWillChange);
     }
   }
 
   function chainsDidChange(obj, keyName, meta$$1) {
     var chainWatchers = meta$$1.readableChainWatchers();
-    if (chainWatchers) {
+    if (chainWatchers !== undefined) {
       chainWatchers.notify(keyName, true, propertyDidChange);
     }
   }
 
   function overrideChains(obj, keyName, meta$$1) {
     var chainWatchers = meta$$1.readableChainWatchers();
-    if (chainWatchers) {
+    if (chainWatchers !== undefined) {
       chainWatchers.revalidate(keyName);
     }
   }
@@ -8622,8 +8542,51 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     try {
       callback.call(binding);
     } finally {
-      endPropertyChanges.call(binding);
+      endPropertyChanges();
+    }
+  }
+
+  function indexOf(array, target, method) {
+    var index = -1,
+        i;
+    // hashes are added to the end of the event array
+    // so it makes sense to start searching at the end
+    // of the array and search in reverse
+    for (i = array.length - 3; i >= 0; i -= 3) {
+      if (target === array[i] && method === array[i + 1]) {
+        index = i;
+        break;
+      }
+    }
+    return index;
+  }
+
+  function accumulateListeners(obj, eventName, otherActions, meta$$1) {
+    var actions = meta$$1.matchingListeners(eventName),
+        i,
+        target,
+        method,
+        flags,
+        actionIndex;
+    if (actions === undefined) {
+      return;
     }
+    var newActions = [];
+
+    for (i = actions.length - 3; i >= 0; i -= 3) {
+      target = actions[i];
+      method = actions[i + 1];
+      flags = actions[i + 2];
+      actionIndex = indexOf(otherActions, target, method);
+
+
+      if (actionIndex === -1) {
+        otherActions.push(target, method, flags);
+        newActions.push(target, method, flags);
+      }
+    }
+
+    return newActions;
   }
 
   function notifyBeforeObservers(obj, keyName, meta$$1) {
@@ -8634,13 +8597,11 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     var eventName = keyName + ':before';
     var listeners = void 0,
         added = void 0;
-    if (deferred) {
+    if (deferred > 0) {
       listeners = beforeObserverSet.add(obj, keyName, eventName);
-      added = accumulateListeners(obj, eventName, listeners);
-      sendEvent(obj, eventName, [obj, keyName], added);
-    } else {
-      sendEvent(obj, eventName, [obj, keyName]);
+      added = accumulateListeners(obj, eventName, listeners, meta$$1);
     }
+    sendEvent(obj, eventName, [obj, keyName], added);
   }
 
   function notifyObservers(obj, keyName, meta$$1) {
@@ -8650,9 +8611,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
     var eventName = keyName + ':change';
     var listeners = void 0;
-    if (deferred) {
+    if (deferred > 0) {
       listeners = observerSet.add(obj, keyName, eventName);
-      accumulateListeners(obj, eventName, listeners);
+      accumulateListeners(obj, eventName, listeners, meta$$1);
     } else {
       sendEvent(obj, eventName, [obj, keyName]);
     }
@@ -8714,7 +8675,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   function DEFAULT_GETTER_FUNCTION(name) {
     return function () {
       var meta$$1 = exports.peekMeta(this);
-      return meta$$1 && meta$$1.peekValues(name);
+      if (meta$$1 !== null && meta$$1 !== undefined) {
+        return meta$$1.peekValues(name);
+      }
     };
   }
 
@@ -8722,7 +8685,10 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     function IGETTER_FUNCTION() {
       var meta$$1 = exports.peekMeta(this),
           proto;
-      var val = meta$$1 && meta$$1.readInheritedValue('values', name);
+      var val = void 0;
+      if (meta$$1 !== null && meta$$1 !== undefined) {
+        val = meta$$1.readInheritedValue('values', name);
+      }
 
       if (val === UNDEFINED) {
         proto = Object.getPrototypeOf(this);
@@ -8783,7 +8749,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       become the explicit value of this property.
   */
   function defineProperty(obj, keyName, desc, data, meta$$1) {
-    if (!meta$$1) {
+    if (meta$$1 === null || meta$$1 === undefined) {
       meta$$1 = meta(obj);
     }
 
@@ -9038,13 +9004,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     }
   }
 
-  // get the chains for the current object. If the current object has
-  // chains inherited from the proto they will be cloned and reconfigured for
-  // the current object.
-  function chainsFor(obj, meta$$1) {
-    return (meta$$1 || meta(obj)).writableChains(makeChainNode);
-  }
-
   function makeChainNode(obj) {
     return new ChainNode(null, null, obj);
   }
@@ -9059,7 +9018,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     m.writeWatching(keyPath, counter + 1);
     if (counter === 0) {
       // activate watching first time
-      chainsFor(obj, m).add(keyPath);
+      m.writableChains(makeChainNode).add(keyPath);
     }
   }
 
@@ -9075,7 +9034,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
     if (counter === 1) {
       m.writeWatching(keyPath, 0);
-      chainsFor(obj, m).remove(keyPath);
+      m.readableChains().remove(keyPath);
     } else if (counter > 1) {
       m.writeWatching(keyPath, counter - 1);
     }
@@ -9282,16 +9241,16 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
 
     ChainNode.prototype.copy = function (obj) {
-      var ret = new ChainNode(null, null, obj);
+      var ret = new ChainNode(null, null, obj),
+          path;
       var paths = this._paths;
-      var path = void 0;
       if (paths !== undefined) {
+        path = void 0;
+
         for (path in paths) {
-          // this check will also catch non-number vals.
-          if (paths[path] <= 0) {
-            continue;
+          if (paths[path] > 0) {
+            ret.add(path);
           }
-          ret.add(path);
         }
       }
       return ret;
@@ -9395,9 +9354,11 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
       // then notify chains...
       var chains = this._chains,
-          parentValue;
-      var node = void 0;
+          parentValue,
+          node;
       if (chains !== undefined) {
+        node = void 0;
+
         for (var key in chains) {
           node = chains[key];
           if (node !== undefined) {
@@ -9418,10 +9379,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
       if (this._parent) {
         this._parent.populateAffected(path, depth + 1, affected);
-      } else {
-        if (depth > 1) {
-          affected.push(this.value(), path);
-        }
+      } else if (depth > 1) {
+        affected.push(this.value(), path);
       }
     };
 
@@ -9536,14 +9495,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       return this.proto !== obj;
     };
 
-    Meta.prototype.setTag = function (tag) {
-      this._tag = tag;
-    };
-
-    Meta.prototype.getTag = function () {
-      return this._tag;
-    };
-
     Meta.prototype.destroy = function () {
       if (this.isMetaDestroyed()) {
         return;
@@ -9555,14 +9506,14 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
           nodeObject = void 0,
           foreignMeta;
       var node = this.readableChains();
-      if (node) {
+      if (node !== undefined) {
         NODE_STACK.push(node);
         // process tree
         while (NODE_STACK.length > 0) {
           node = NODE_STACK.pop();
           // push children
           nodes = node._chains;
-          if (nodes) {
+          if (nodes !== undefined) {
             for (key in nodes) {
               if (nodes[key] !== undefined) {
                 NODE_STACK.push(nodes[key]);
@@ -9573,7 +9524,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
           // remove chainWatcher in node object
           if (node._watching) {
             nodeObject = node._object;
-            if (nodeObject) {
+            if (nodeObject !== undefined) {
               foreignMeta = exports.peekMeta(nodeObject);
               // avoid cleaning up chain watchers when both current and
               // foreign objects are being destroyed
@@ -9806,11 +9757,12 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
       var ret = this._chains;
       if (ret === undefined) {
-        if (this.parent) {
-          ret = this._chains = this.parent.writableChains(create).copy(this.source);
+        if (this.parent === undefined) {
+          ret = create(this.source);
         } else {
-          ret = this._chains = create(this.source);
+          ret = this.parent.writableChains(create).copy(this.source);
         }
+        this._chains = ret;
       }
       return ret;
     };
@@ -9820,7 +9772,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     };
 
     Meta.prototype.writeWatching = function (subkey, value) {
-      true && !!this.isMetaDestroyed() && emberDebug.assert('Cannot update watchers for `hello` on `' + emberUtils.toString(this.source) + '` after it has been destroyed.', !this.isMetaDestroyed());
+      true && !!this.isMetaDestroyed() && emberDebug.assert('Cannot update watchers for `' + subkey + '` on `' + emberUtils.toString(this.source) + '` after it has been destroyed.', !this.isMetaDestroyed());
 
       var map = this._getOrCreateOwnMap('_watching');
       map[subkey] = value;
@@ -10031,7 +9983,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
         pointer = getPrototypeOf(pointer);
         {
-          counters.peakPrototypeWalks++;
+          counters.peekPrototypeWalks++;
         }
       }
     };
@@ -10051,17 +10003,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     };
   }
 
-  function deleteMeta(obj) {
-    {
-      counters.deleteCalls++;
-    }
-
-    var meta = exports.peekMeta(obj);
-    if (meta !== undefined) {
-      meta.destroy();
-    }
-  }
-
   /**
     Retrieves the meta hash for an object. If `writable` is true ensures the
     hash is writable for this object as well.
@@ -10179,46 +10120,29 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     return DefaultStore;
   }();
 
-  var IS_GLOBAL = /^[A-Z$]/;
   var IS_GLOBAL_PATH = /^[A-Z$].*[\.]/;
-  new Cache(1000, function (key) {
-    return IS_GLOBAL.test(key);
-  });
 
   var isGlobalPathCache = new Cache(1000, function (key) {
     return IS_GLOBAL_PATH.test(key);
   });
-  var hasThisCache = new Cache(1000, function (key) {
-    return key.lastIndexOf('this.', 0) === 0;
-  });
   var firstDotIndexCache = new Cache(1000, function (key) {
     return key.indexOf('.');
   });
 
   var firstKeyCache = new Cache(1000, function (path) {
     var index = firstDotIndexCache.get(path);
-    if (index === -1) {
-      return path;
-    } else {
-      return path.slice(0, index);
-    }
+    return index === -1 ? path : path.slice(0, index);
   });
 
   var tailPathCache = new Cache(1000, function (path) {
     var index = firstDotIndexCache.get(path);
-    if (index !== -1) {
-      return path.slice(index + 1);
-    }
+    return index === -1 ? undefined : path.slice(index + 1);
   });
 
   function isGlobalPath(path) {
     return isGlobalPathCache.get(path);
   }
 
-  function hasThis(path) {
-    return hasThisCache.get(path);
-  }
-
   function isPath(path) {
     return firstDotIndexCache.get(path) !== -1;
   }
@@ -10281,7 +10205,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     true && !(arguments.length === 2) && emberDebug.assert('Get must be called with two arguments; an object and a property key', arguments.length === 2);
     true && !(obj !== undefined && obj !== null) && emberDebug.assert('Cannot call get with \'' + keyName + '\' on an undefined object.', obj !== undefined && obj !== null);
     true && !(typeof keyName === 'string') && emberDebug.assert('The key provided to get must be a string, you passed ' + keyName, typeof keyName === 'string');
-    true && !!hasThis(keyName) && emberDebug.assert('\'this\' in paths is not supported', !hasThis(keyName));
+    true && !(keyName.lastIndexOf('this.', 0) !== 0) && emberDebug.assert('\'this\' in paths is not supported', keyName.lastIndexOf('this.', 0) !== 0);
     true && !(keyName !== '') && emberDebug.assert('Cannot call `Ember.get` with an empty string', keyName !== '');
 
     var value = obj[keyName];
@@ -10291,7 +10215,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
       return value.get(obj, keyName);
     } else if (isPath(keyName)) {
       return _getPath(obj, keyName);
-    } else if (value === undefined && 'object' === typeof obj && !(keyName in obj) && 'function' === typeof obj.unknownProperty) {
+    } else if (value === undefined && 'object' === typeof obj && !(keyName in obj) && typeof obj.unknownProperty === 'function') {
       return obj.unknownProperty(keyName);
     } else {
       return value;
@@ -10362,7 +10286,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     true && !(arguments.length === 3 || arguments.length === 4) && emberDebug.assert('Set must be called with three or four arguments; an object, a property key, a value and tolerant true/false', arguments.length === 3 || arguments.length === 4);
     true && !(obj && typeof obj === 'object' || typeof obj === 'function') && emberDebug.assert('Cannot call set with \'' + keyName + '\' on an undefined object.', obj && typeof obj === 'object' || typeof obj === 'function');
     true && !(typeof keyName === 'string') && emberDebug.assert('The key provided to set must be a string, you passed ' + keyName, typeof keyName === 'string');
-    true && !!hasThis(keyName) && emberDebug.assert('\'this\' in paths is not supported', !hasThis(keyName));
+    true && !(keyName.lastIndexOf('this.', 0) !== 0) && emberDebug.assert('\'this\' in paths is not supported', keyName.lastIndexOf('this.', 0) !== 0);
     true && !!obj.isDestroyed && emberDebug.assert('calling set on destroyed object: ' + emberUtils.toString(obj) + '.' + keyName + ' = ' + emberUtils.toString(value), !obj.isDestroyed);
 
     if (isPath(keyName)) {
@@ -10376,10 +10300,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     if (isDescriptor) {
       /* computed property */
       currentValue.set(obj, keyName, value);
-    } else if (obj.setUnknownProperty && currentValue === undefined && !(keyName in obj)) {
+    } else if (currentValue === undefined && 'object' === typeof obj && !(keyName in obj) && typeof obj.setUnknownProperty === 'function') {
       /* unknown property */
-      true && !(typeof obj.setUnknownProperty === 'function') && emberDebug.assert('setUnknownProperty must be a function', typeof obj.setUnknownProperty === 'function');
-
       obj.setUnknownProperty(keyName, value);
     } else if (!(currentValue === value)) {
       meta$$1 = exports.peekMeta(obj);
@@ -10418,31 +10340,20 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   }
 
   function setPath(root, path, value, tolerant) {
-    // get the last part of the path
-    var keyName = path.slice(path.lastIndexOf('.') + 1);
+    var parts = path.split('.');
+    var keyName = parts.pop();
 
-    // get the first part of the part
-    path = path === keyName ? keyName : path.slice(0, path.length - (keyName.length + 1));
+    true && !(keyName.trim().length > 0) && emberDebug.assert('Property set failed: You passed an empty path', keyName.trim().length > 0);
 
-    // unless the path is this, look up the first part to
-    // get the root
-    if (path !== 'this') {
-      root = _getPath(root, path);
-    }
+    var newPath = parts.join('.');
 
-    if (!keyName || keyName.length === 0) {
-      throw new emberDebug.Error('Property set failed: You passed an empty path');
-    }
+    var newRoot = _getPath(root, newPath);
 
-    if (!root) {
-      if (tolerant) {
-        return;
-      } else {
-        throw new emberDebug.Error('Property set failed: object in path "' + path + '" could not be found or was destroyed.');
-      }
+    if (newRoot) {
+      return set(newRoot, keyName, value);
+    } else if (!tolerant) {
+      throw new emberDebug.Error('Property set failed: object in path "' + newPath + '" could not be found or was destroyed.');
     }
-
-    return set(root, keyName, value);
   }
 
   /**
@@ -10492,7 +10403,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   
     @method expandProperties
     @for Ember
-    @private
+    @public
     @param {String} pattern The property pattern to expand.
     @param {Function} callback The callback to invoke.  It is invoked once per
     expansion, and is passed the expansion.
@@ -10535,7 +10446,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   /**
   @module ember-metal
   */
-
   /**
     Starts watching a property on an object. Whenever the property changes,
     invokes `Ember.propertyWillChange` and `Ember.propertyDidChange`. This is the
@@ -10550,33 +10460,26 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @param {String} _keyPath
   */
   function watch(obj, _keyPath, m) {
-    if (!isPath(_keyPath)) {
-      watchKey(obj, _keyPath, m);
-    } else {
+    if (isPath(_keyPath)) {
       watchPath(obj, _keyPath, m);
+    } else {
+      watchKey(obj, _keyPath, m);
     }
   }
 
+  function watcherCount(obj, key) {
+    var meta$$1 = exports.peekMeta(obj);
+    return meta$$1 && meta$$1.peekWatching(key) || 0;
+  }
+
   function unwatch(obj, _keyPath, m) {
-    if (!isPath(_keyPath)) {
-      unwatchKey(obj, _keyPath, m);
-    } else {
+    if (isPath(_keyPath)) {
       unwatchPath(obj, _keyPath, m);
+    } else {
+      unwatchKey(obj, _keyPath, m);
     }
   }
 
-  /**
-    Tears down the meta on an object so that it can be garbage collected.
-    Multiple calls will have no effect.
-  
-    @method destroy
-    @for Ember
-    @param {Object} obj  the object to destroy
-    @return {void}
-    @private
-  */
-
-
   /**
   @module ember
   @submodule ember-metal
@@ -10589,16 +10492,17 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   function addDependentKeys(desc, obj, keyName, meta) {
     // the descriptor has a list of dependent keys, so
     // add all of its dependent keys.
-    var idx = void 0,
-        depKey = void 0;
-    var depKeys = desc._dependentKeys;
-    if (!depKeys) {
+    var depKeys = desc._dependentKeys,
+        idx,
+        depKey;
+    if (depKeys === null || depKeys === undefined) {
       return;
     }
 
     for (idx = 0; idx < depKeys.length; idx++) {
       depKey = depKeys[idx];
       // Increment the number of times depKey depends on keyName.
+
       meta.writeDeps(depKey, keyName, (meta.peekDeps(depKey, keyName) || 0) + 1);
       // Watch the depKey
       watch(obj, depKey, meta);
@@ -10611,7 +10515,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     var depKeys = desc._dependentKeys,
         idx,
         depKey;
-    if (!depKeys) {
+    if (depKeys === null || depKeys === undefined) {
       return;
     }
 
@@ -11525,20 +11429,22 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   };
 
   var onerror = void 0;
-  var onErrorTarget = {
-    get onerror() {
-      return dispatchOverride || onerror;
-    }
-  };
-
   // Ember.onerror getter
 
   // Ember.onerror setter
-
+  function setOnerror(handler) {
+    onerror = handler;
+  }
 
   var dispatchOverride = void 0;
   // dispatch error
-
+  function dispatchError(error) {
+    if (dispatchOverride) {
+      dispatchOverride(error);
+    } else {
+      defaultDispatch(error);
+    }
+  }
 
   // allows testing adapter to override dispatch
 
@@ -11574,116 +11480,125 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
    * practice, most use cases satisfy this limitation which is why it is included
    * in ember-metal.
    */
-  function WeakMap$1(iterable) {
-    var i, _iterable$i, key, value;
-
-    if (!(this instanceof WeakMap$1)) {
-      throw new TypeError('Constructor WeakMap requires \'new\'');
-    }
+  var WeakMapPolyfill = function () {
+    function WeakMapPolyfill(iterable) {
+      var i, _iterable$i, key, value;
 
-    this._id = emberUtils.GUID_KEY + id++;
+      this._id = emberUtils.GUID_KEY + id++;
 
-    if (iterable === null || iterable === undefined) {} else if (Array.isArray(iterable)) {
-      for (i = 0; i < iterable.length; i++) {
-        _iterable$i = iterable[i], key = _iterable$i[0], value = _iterable$i[1];
+      if (iterable === null || iterable === undefined) {} else if (Array.isArray(iterable)) {
+        for (i = 0; i < iterable.length; i++) {
+          _iterable$i = iterable[i], key = _iterable$i[0], value = _iterable$i[1];
 
 
-        this.set(key, value);
+          this.set(key, value);
+        }
+      } else {
+        throw new TypeError('The weak map constructor polyfill only supports an array argument');
       }
-    } else {
-      throw new TypeError('The weak map constructor polyfill only supports an array argument');
     }
-  }
 
-  /*
-   * @method get
-   * @param key {Object | Function}
-   * @return {Any} stored value
-   */
-  WeakMap$1.prototype.get = function (obj) {
-    if (!isObject$1(obj)) {
-      return undefined;
-    }
+    /*
+     * @method get
+     * @param key {Object | Function}
+     * @return {Any} stored value
+     */
 
-    var meta$$1 = exports.peekMeta(obj),
-        map;
-    if (meta$$1) {
-      map = meta$$1.readableWeak();
+    WeakMapPolyfill.prototype.get = function (obj) {
+      if (!isObject$1(obj)) {
+        return undefined;
+      }
+
+      var meta$$1 = exports.peekMeta(obj),
+          map,
+          val;
+      if (meta$$1) {
+        map = meta$$1.readableWeak();
+
+        if (map !== undefined) {
+          val = map[this._id];
 
-      if (map) {
-        if (map[this._id] === UNDEFINED) {
-          return undefined;
+          if (val === UNDEFINED) {
+            return undefined;
+          }
+          return val;
         }
+      }
+    };
+
+    /*
+     * @method set
+     * @param key {Object | Function}
+     * @param value {Any}
+     * @return {WeakMap} the weak map
+     */
 
-        return map[this._id];
+    WeakMapPolyfill.prototype.set = function (obj, value) {
+      if (!isObject$1(obj)) {
+        throw new TypeError('Invalid value used as weak map key');
       }
-    }
-  };
 
-  /*
-   * @method set
-   * @param key {Object | Function}
-   * @param value {Any}
-   * @return {WeakMap} the weak map
-   */
-  WeakMap$1.prototype.set = function (obj, value) {
-    if (!isObject$1(obj)) {
-      throw new TypeError('Invalid value used as weak map key');
-    }
+      if (value === undefined) {
+        value = UNDEFINED;
+      }
 
-    if (value === undefined) {
-      value = UNDEFINED;
-    }
+      meta(obj).writableWeak()[this._id] = value;
 
-    meta(obj).writableWeak()[this._id] = value;
+      return this;
+    };
 
-    return this;
-  };
+    /*
+     * @method has
+     * @param key {Object | Function}
+     * @return {boolean} if the key exists
+     */
+
+    WeakMapPolyfill.prototype.has = function (obj) {
+      if (!isObject$1(obj)) {
+        return false;
+      }
+
+      var meta$$1 = exports.peekMeta(obj),
+          map;
+      if (meta$$1) {
+        map = meta$$1.readableWeak();
+
+        if (map !== undefined) {
+          return map[this._id] !== undefined;
+        }
+      }
 
-  /*
-   * @method has
-   * @param key {Object | Function}
-   * @return {boolean} if the key exists
-   */
-  WeakMap$1.prototype.has = function (obj) {
-    if (!isObject$1(obj)) {
       return false;
-    }
+    };
 
-    var meta$$1 = exports.peekMeta(obj),
-        map;
-    if (meta$$1) {
-      map = meta$$1.readableWeak();
+    /*
+     * @method delete
+     * @param key {Object | Function}
+     * @return {boolean} if the key was deleted
+     */
 
-      if (map) {
-        return map[this._id] !== undefined;
+    WeakMapPolyfill.prototype.delete = function (obj) {
+      if (this.has(obj)) {
+        delete exports.peekMeta(obj).writableWeak()[this._id];
+        return true;
+      } else {
+        return false;
       }
-    }
+    };
 
-    return false;
-  };
+    /*
+     * @method toString
+     * @return {String}
+     */
 
-  /*
-   * @method delete
-   * @param key {Object | Function}
-   * @return {boolean} if the key was deleted
-   */
-  WeakMap$1.prototype.delete = function (obj) {
-    if (this.has(obj)) {
-      delete meta(obj).writableWeak()[this._id];
-      return true;
-    } else {
-      return false;
-    }
-  };
+    WeakMapPolyfill.prototype.toString = function () {
+      return '[object WeakMap]';
+    };
 
-  /*
-   * @method toString
-   * @return {String}
-   */
-  WeakMap$1.prototype.toString = function () {
-    return '[object WeakMap]';
-  };
+    return WeakMapPolyfill;
+  }();
+
+  var weak_map = emberUtils.HAS_NATIVE_WEAKMAP ? WeakMap : WeakMapPolyfill;
 
   /**
     Returns true if the passed value is null or undefined. This avoids errors
@@ -11832,7 +11747,16 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   */
 
 
-  var backburner = new Backburner(['sync', 'actions', 'destroy'], {
+  var onErrorTarget = {
+    get onerror() {
+      return dispatchError;
+    },
+    set onerror(handler) {
+      return setOnerror(handler);
+    }
+  };
+
+  var backburner$1 = new Backburner(['sync', 'actions', 'destroy'], {
     GUID_KEY: emberUtils.GUID_KEY,
     sync: {
       before: beginPropertyChanges,
@@ -11840,10 +11764,10 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     },
     defaultQueue: 'actions',
     onBegin: function (current) {
-      run$1.currentRunLoop = current;
+      run.currentRunLoop = current;
     },
     onEnd: function (current, next) {
-      run$1.currentRunLoop = next;
+      run.currentRunLoop = next;
     },
     onErrorTarget: onErrorTarget,
     onErrorMethod: 'onerror'
@@ -11881,8 +11805,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {Object} return value from invoking the passed function.
     @public
   */
-  function run$1() {
-    return backburner.run.apply(backburner, arguments);
+  function run() {
+    return backburner$1.run.apply(backburner$1, arguments);
   }
 
   /**
@@ -11923,8 +11847,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     when called within an existing loop, no return value is possible.
     @public
   */
-  run$1.join = function () {
-    return backburner.join.apply(backburner, arguments);
+  run.join = function () {
+    return backburner$1.join.apply(backburner$1, arguments);
   };
 
   /**
@@ -11977,7 +11901,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @since 1.4.0
     @public
   */
-  run$1.bind = function () {
+  run.bind = function () {
     var _len, curried, _key;
 
     for (_len = arguments.length, curried = Array(_len), _key = 0; _key < _len; _key++) {
@@ -11991,13 +11915,13 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
         args[_key2] = arguments[_key2];
       }
 
-      return run$1.join.apply(run$1, curried.concat(args));
+      return run.join.apply(run, curried.concat(args));
     };
   };
 
-  run$1.backburner = backburner;
-  run$1.currentRunLoop = null;
-  run$1.queues = backburner.queueNames;
+  run.backburner = backburner$1;
+  run.currentRunLoop = null;
+  run.queues = backburner$1.queueNames;
 
   /**
     Begins a new RunLoop. Any deferred actions invoked after the begin will
@@ -12014,8 +11938,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {void}
     @public
   */
-  run$1.begin = function () {
-    backburner.begin();
+  run.begin = function () {
+    backburner$1.begin();
   };
 
   /**
@@ -12033,8 +11957,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {void}
     @public
   */
-  run$1.end = function () {
-    backburner.end();
+  run.end = function () {
+    backburner$1.end();
   };
 
   /**
@@ -12087,20 +12011,20 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {*} Timer information for use in canceling, see `run.cancel`.
     @public
   */
-  run$1.schedule = function () /* queue, target, method */{
-    true && !(run$1.currentRunLoop || !emberDebug.isTesting()) && emberDebug.assert('You have turned on testing mode, which disabled the run-loop\'s autorun. ' + 'You will need to wrap any code with asynchronous side-effects in a run', run$1.currentRunLoop || !emberDebug.isTesting());
+  run.schedule = function () /* queue, target, method */{
+    true && !(run.currentRunLoop || !emberDebug.isTesting()) && emberDebug.assert('You have turned on testing mode, which disabled the run-loop\'s autorun. ' + 'You will need to wrap any code with asynchronous side-effects in a run', run.currentRunLoop || !emberDebug.isTesting());
 
-    return backburner.schedule.apply(backburner, arguments);
+    return backburner$1.schedule.apply(backburner$1, arguments);
   };
 
   // Used by global test teardown
-  run$1.hasScheduledTimers = function () {
-    return backburner.hasTimers();
+  run.hasScheduledTimers = function () {
+    return backburner$1.hasTimers();
   };
 
   // Used by global test teardown
-  run$1.cancelTimers = function () {
-    backburner.cancelTimers();
+  run.cancelTimers = function () {
+    backburner$1.cancelTimers();
   };
 
   /**
@@ -12120,9 +12044,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {void}
     @private
   */
-  run$1.sync = function () {
-    if (backburner.currentInstance) {
-      backburner.currentInstance.queues.sync.flush();
+  run.sync = function () {
+    if (backburner$1.currentInstance) {
+      backburner$1.currentInstance.queues.sync.flush();
     }
   };
 
@@ -12152,8 +12076,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {*} Timer information for use in canceling, see `run.cancel`.
     @public
   */
-  run$1.later = function () /*target, method*/{
-    return backburner.later.apply(backburner, arguments);
+  run.later = function () /*target, method*/{
+    return backburner$1.later.apply(backburner$1, arguments);
   };
 
   /**
@@ -12169,17 +12093,17 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {Object} Timer information for use in canceling, see `run.cancel`.
     @public
   */
-  run$1.once = function () {
+  run.once = function () {
     var _len3, args, _key3;
 
-    true && !(run$1.currentRunLoop || !emberDebug.isTesting()) && emberDebug.assert('You have turned on testing mode, which disabled the run-loop\'s autorun. ' + 'You will need to wrap any code with asynchronous side-effects in a run', run$1.currentRunLoop || !emberDebug.isTesting());
+    true && !(run.currentRunLoop || !emberDebug.isTesting()) && emberDebug.assert('You have turned on testing mode, which disabled the run-loop\'s autorun. ' + 'You will need to wrap any code with asynchronous side-effects in a run', run.currentRunLoop || !emberDebug.isTesting());
 
     for (_len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
       args[_key3] = arguments[_key3];
     }
 
     args.unshift('actions');
-    return backburner.scheduleOnce.apply(backburner, args);
+    return backburner$1.scheduleOnce.apply(backburner$1, args);
   };
 
   /**
@@ -12234,10 +12158,10 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {Object} Timer information for use in canceling, see `run.cancel`.
     @public
   */
-  run$1.scheduleOnce = function () /*queue, target, method*/{
-    true && !(run$1.currentRunLoop || !emberDebug.isTesting()) && emberDebug.assert('You have turned on testing mode, which disabled the run-loop\'s autorun. ' + 'You will need to wrap any code with asynchronous side-effects in a run', run$1.currentRunLoop || !emberDebug.isTesting());
+  run.scheduleOnce = function () /*queue, target, method*/{
+    true && !(run.currentRunLoop || !emberDebug.isTesting()) && emberDebug.assert('You have turned on testing mode, which disabled the run-loop\'s autorun. ' + 'You will need to wrap any code with asynchronous side-effects in a run', run.currentRunLoop || !emberDebug.isTesting());
 
-    return backburner.scheduleOnce.apply(backburner, arguments);
+    return backburner$1.scheduleOnce.apply(backburner$1, arguments);
   };
 
   /**
@@ -12303,7 +12227,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {Object} Timer information for use in canceling, see `run.cancel`.
     @public
   */
-  run$1.next = function () {
+  run.next = function () {
     var _len4, args, _key4;
 
     for (_len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
@@ -12311,7 +12235,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     }
 
     args.push(1);
-    return backburner.later.apply(backburner, args);
+    return backburner$1.later.apply(backburner$1, args);
   };
 
   /**
@@ -12369,8 +12293,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {Boolean} true if canceled or false/undefined if it wasn't found
     @public
   */
-  run$1.cancel = function (timer) {
-    return backburner.cancel(timer);
+  run.cancel = function (timer) {
+    return backburner$1.cancel(timer);
   };
 
   /**
@@ -12442,8 +12366,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {Array} Timer information for use in canceling, see `run.cancel`.
     @public
   */
-  run$1.debounce = function () {
-    return backburner.debounce.apply(backburner, arguments);
+  run.debounce = function () {
+    return backburner$1.debounce.apply(backburner$1, arguments);
   };
 
   /**
@@ -12485,8 +12409,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @return {Array} Timer information for use in canceling, see `run.cancel`.
     @public
   */
-  run$1.throttle = function () {
-    return backburner.throttle.apply(backburner, arguments);
+  run.throttle = function () {
+    return backburner$1.throttle.apply(backburner$1, arguments);
   };
 
   /**
@@ -12499,9 +12423,9 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
     @param {String} after the name of the queue to add after.
     @private
   */
-  run$1._addQueue = function (name, after) {
-    if (run$1.queues.indexOf(name) === -1) {
-      run$1.queues.splice(run$1.queues.indexOf(after) + 1, 0, name);
+  run._addQueue = function (name, after) {
+    if (run.queues.indexOf(name) === -1) {
+      run.queues.splice(run.queues.indexOf(after) + 1, 0, name);
     }
   };
 
@@ -13418,7 +13342,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
 
       // If we haven't scheduled the binding yet, schedule it.
       if (existingDir === undefined) {
-        run$1.schedule('sync', this, '_sync');
+        run.schedule('sync', this, '_sync');
         this._direction = dir;
       }
 
@@ -14722,16 +14646,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   exports.getOnerror = function () {
     return onerror;
   };
-  exports.setOnerror = function (handler) {
-    onerror = handler;
-  };
-  exports.dispatchError = function (error) {
-    if (dispatchOverride) {
-      dispatchOverride(error);
-    } else {
-      defaultDispatch(error);
-    }
-  };
+  exports.setOnerror = setOnerror;
+  exports.dispatchError = dispatchError;
   exports.setDispatchOverride = function (handler) {
     dispatchOverride = handler;
   };
@@ -14753,8 +14669,8 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   };
   exports.set = set;
   exports.trySet = trySet;
-  exports.WeakMap = WeakMap$1;
-  exports.accumulateListeners = accumulateListeners;
+  exports.WeakMap = weak_map;
+  exports.WeakMapPolyfill = WeakMapPolyfill;
   exports.addListener = addListener;
   exports.hasListeners = function (obj, eventName) {
     var meta$$1 = exports.peekMeta(obj);
@@ -14792,7 +14708,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   exports.isPresent = function (obj) {
     return !isBlank(obj);
   };
-  exports.run = run$1;
+  exports.run = run;
   exports.ObserverSet = ObserverSet;
   exports.beginPropertyChanges = beginPropertyChanges;
   exports.changeProperties = changeProperties;
@@ -14825,21 +14741,21 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   exports.watchPath = watchPath;
   exports.unwatchPath = unwatchPath;
   exports.destroy = function (obj) {
-    deleteMeta(obj);
+    {
+      counters.deleteCalls++;
+    }
+
+    var meta = exports.peekMeta(obj);
+    if (meta !== undefined) {
+      meta.destroy();
+    }
   };
   exports.isWatching = function (obj, key) {
-    if (typeof obj !== 'object' || obj === null) {
-      return false;
-    }
-    var meta$$1 = exports.peekMeta(obj);
-    return (meta$$1 && meta$$1.peekWatching(key)) > 0;
+    return watcherCount(obj, key) > 0;
   };
   exports.unwatch = unwatch;
   exports.watch = watch;
-  exports.watcherCount = function (obj, key) {
-    var meta$$1 = exports.peekMeta(obj);
-    return meta$$1 && meta$$1.peekWatching(key) || 0;
-  };
+  exports.watcherCount = watcherCount;
   exports.libraries = libraries;
   exports.Libraries = Libraries;
   exports.Map = Map;
@@ -17146,7 +17062,7 @@ enifed('ember/features', ['exports', 'ember-environment', 'ember-utils'], functi
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.15.3";
+  exports.default = "2.16.0-beta.1";
 });
 enifed("handlebars", ["exports"], function (exports) {
   "use strict";