ember-source 1.9.0.alpha.2 → 1.9.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0f26145b16f36cfb7a17292c4661f4496e485b
-  data.tar.gz: dd54dbe04f5aee0f197926fe30644147512a6a87
+  metadata.gz: d1a01f22dd95285d1cda550257201f420a41c000
+  data.tar.gz: 27e8b7aa7dda99437965c82490584345828b7e95
 SHA512:
-  metadata.gz: e9b1fa211134cfcb0bc0c7b52602f19bdea9988c3d632cafcec96eb82e6274f698220f1677586ee9fb3c24fd8e5c51f135d712f0727f6e11728f1ea92681632c
-  data.tar.gz: 6ee1cb60784818ec726575425ece7a30536a4f06f5a1cbeead6dc5c0cc90c893af43ccbe743b41a36e4230062aca69147ff9f82e65278626722040e0055c7114
+  metadata.gz: 337ad6c012a2d07ba5d2464ab1756c3b2945d56deae80fe2ab336b924068cff037337c7b3a2fa7030bfdae0e6b55515582e59664bcd575154e6aec9c0aedb9a3
+  data.tar.gz: 2e561489ba2c016276f4f65f619f2aabfecb01d34e914f2cfea26d97c9d70df3b6cc8d2136c80a675e23277bd755010b730d68983516249e12b5b3b6103c758d

data/VERSION

@@ -1 +1 @@
-1.9.0-alpha.2
+1.9.0-beta.1

data/dist/ember-runtime.js

@@ -5,7 +5,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   1.9.0-alpha
+ * @version   1.9.0-beta.1
  */
 
 (function() {
@@ -640,10 +640,11 @@ define("backburner/deferred-action-queues",
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var each = __dependency1__.each;
+    var isString = __dependency1__.isString;
     var Queue = __dependency2__["default"];
 
     function DeferredActionQueues(queueNames, options) {
-      var queues = this.queues = Object.create(null);
+      var queues = this.queues = {};
       this.queueNames = queueNames = queueNames || [];
 
       this.options = options;
@@ -662,9 +663,7 @@ define("backburner/deferred-action-queues",
         var queues = this.queues;
         var queue = queues[name];
 
-        if (!queue) {
-          noSuchQueue(name);
-        }
+        if (!queue) { noSuchQueue(name); }
 
         if (onceFlag) {
           return queue.pushUnique(target, method, args, stack);
@@ -673,6 +672,26 @@ define("backburner/deferred-action-queues",
         }
       },
 
+      invoke: function(target, method, args, _, _errorRecordedForStack) {
+        if (args && args.length > 0) {
+          method.apply(target, args);
+        } else {
+          method.call(target);
+        }
+      },
+
+      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
+        try {
+          if (args && args.length > 0) {
+            method.apply(target, args);
+          } else {
+            method.call(target);
+          }
+        } catch(error) {
+          onError(error, errorRecordedForStack);
+        }
+      },
+
       flush: function() {
         var queues = this.queues;
         var queueNames = this.queueNames;
@@ -680,23 +699,85 @@ define("backburner/deferred-action-queues",
         var queueNameIndex = 0;
         var numberOfQueues = queueNames.length;
         var options = this.options;
+        var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+        var invoke = onError ? this.invokeWithOnError : this.invoke;
 
         while (queueNameIndex < numberOfQueues) {
           queueName = queueNames[queueNameIndex];
           queue = queues[queueName];
+          queueItems = queue._queueBeingFlushed = queue._queue.slice();
+          queue._queue = [];
+          queue.targetQueues = Object.create(null);
+
+          var queueOptions = queue.options; // TODO: write a test for this
+          var before = queueOptions && queueOptions.before;
+          var after = queueOptions && queueOptions.after;
+          var target, method, args, errorRecordedForStack;
+          var queueIndex = 0;
+          var numberOfQueueItems = queueItems.length;
+
+          if (numberOfQueueItems && before) {
+            before();
+          }
 
-          var numberOfQueueItems = queue._queue.length;
+          while (queueIndex < numberOfQueueItems) {
+            target                = queueItems[queueIndex];
+            method                = queueItems[queueIndex+1];
+            args                  = queueItems[queueIndex+2];
+            errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
 
-          if (numberOfQueueItems === 0) {
-            queueNameIndex++;
+            //
+
+            if (isString(method)) {
+              method = target[method];
+            }
+
+            // method could have been nullified / canceled during flush
+            if (method) {
+              //
+              //    ** 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.
+              //
+              invoke(target, method, args, onError, errorRecordedForStack);
+            }
+
+            queueIndex += 4;
+          }
+
+          queue._queueBeingFlushed = null;
+          if (numberOfQueueItems && after) {
+            after();
+          }
+
+          if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
+            queueNameIndex = priorQueueNameIndex;
           } else {
-            queue.flush(false /* async */);
-            queueNameIndex = 0;
+            queueNameIndex++;
           }
         }
       }
     };
 
+    function indexOfPriorQueueWithActions(daq, currentQueueIndex) {
+      var queueName, queue;
+
+      for (var i = 0, l = currentQueueIndex; i <= l; i++) {
+        queueName = daq.queueNames[i];
+        queue = daq.queues[queueName];
+        if (queue._queue.length) { return i; }
+      }
+
+      return -1;
+    }
+
     __exports__["default"] = DeferredActionQueues;
   });
 define("backburner/platform",
@@ -714,11 +795,9 @@ define("backburner/platform",
     __exports__.needsIETryCatchFix = needsIETryCatchFix;
   });
 define("backburner/queue",
-  ["./utils","exports"],
-  function(__dependency1__, __exports__) {
+  ["exports"],
+  function(__exports__) {
     "use strict";
-    var isString = __dependency1__.isString;
-
     function Queue(name, options, globalOptions) {
       this.name = name;
       this.globalOptions = globalOptions || {};
@@ -816,89 +895,56 @@ define("backburner/queue",
         };
       },
 
-      invoke: function(target, method, args, _, _errorRecordedForStack) {
-        if (args && args.length > 0) {
-          method.apply(target, args);
-        } else {
-          method.call(target);
-        }
-      },
-
-      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
-        try {
-          if (args && args.length > 0) {
-            method.apply(target, args);
-          } else {
-            method.call(target);
-          }
-        } catch(error) {
-          onError(error, errorRecordedForStack);
-        }
-      },
-
-      flush: function(sync) {
+      // TODO: remove me, only being used for Ember.run.sync
+      flush: function() {
         var queue = this._queue;
-        var length = queue.length;
-
-        if (length === 0) {
-          return;
-        }
-
         var globalOptions = this.globalOptions;
         var options = this.options;
         var before = options && options.before;
         var after = options && options.after;
-        var onError = globalOptions.onError || (globalOptions.onErrorTarget &&
-                                                globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
-        var target, method, args, errorRecordedForStack;
-        var invoke = onError ? this.invokeWithOnError : this.invoke;
+        var onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
+        var target, method, args, stack, i, l = queue.length;
 
         this.targetQueues = Object.create(null);
-        var queueItems = this._queueBeingFlushed = this._queue.slice();
-        this._queue = [];
-
-        if (before) {
-          before();
-        }
-
-        for (var i = 0; i < length; i += 4) {
-          target                = queueItems[i];
-          method                = queueItems[i+1];
-          args                  = queueItems[i+2];
-          errorRecordedForStack = queueItems[i+3]; // Debugging assistance
 
-          if (isString(method)) {
-            method = target[method];
-          }
+        if (l && before) { before(); }
+        for (i = 0; i < l; i += 4) {
+          target = queue[i];
+          method = queue[i+1];
+          args   = queue[i+2];
+          stack  = queue[i+3]; // Debugging assistance
 
-          // method could have been nullified / canceled during flush
-          if (method) {
-            //
-            //    ** 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.
-            //
-            invoke(target, method, args, onError, errorRecordedForStack);
+          // TODO: error handling
+          if (args && args.length > 0) {
+            if (onError) {
+              try {
+                method.apply(target, args);
+              } catch (e) {
+                onError(e);
+              }
+            } else {
+              method.apply(target, args);
+            }
+          } else {
+            if (onError) {
+              try {
+                method.call(target);
+              } catch(e) {
+                onError(e);
+              }
+            } else {
+              method.call(target);
+            }
           }
         }
+        if (l && after) { after(); }
 
-        if (after) {
-          after();
-        }
-
-        this._queueBeingFlushed = undefined;
-
-        if (sync !== false &&
-            this._queue.length > 0) {
-          // check if new items have been added
-          this.flush(true);
+        // check if new items have been added
+        if (queue.length > l) {
+          this._queue = queue.slice(l);
+          this.flush();
+        } else {
+          this._queue.length = 0;
         }
       },
 
@@ -934,11 +980,9 @@ define("backburner/queue",
         // if not found in current queue
         // could be in the queue that is being flushed
         queue = this._queueBeingFlushed;
-
         if (!queue) {
           return;
         }
-
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
@@ -1862,20 +1906,18 @@ define("container/container",
       return factoryInjections;
     }
 
-    if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-      var normalizeInjectionsHash = function(hash) {
-        var injections = [];
+    function normalizeInjectionsHash(hash) {
+      var injections = [];
 
-        for (var key in hash) {
-          if (hash.hasOwnProperty(key)) {
-            Ember.assert("Expected a proper full name, given '" + hash[key] + "'", validateFullName(hash[key]));
+      for (var key in hash) {
+        if (hash.hasOwnProperty(key)) {
+          Ember.assert("Expected a proper full name, given '" + hash[key] + "'", validateFullName(hash[key]));
 
-            addInjection(injections, key, hash[key]);
-          }
+          addInjection(injections, key, hash[key]);
         }
+      }
 
-        return injections;
-      };
+      return injections;
     }
 
     function instantiate(container, fullName) {
@@ -1892,15 +1934,7 @@ define("container/container",
             'Most likely an improperly defined class or an invalid module export.');
         }
 
-        if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-          // Ensure that all lazy injections are valid at instantiation time
-          if (typeof factory.lazyInjections === 'function') {
-            lazyInjections = factory.lazyInjections();
-
-            validateInjections(container, normalizeInjectionsHash(lazyInjections));
-          }
-        }
-
+        
         if (typeof factory.extend === 'function') {
           // assume the factory was extendable and is already injected
           return factory.create();
@@ -2014,7 +2048,7 @@ define("ember-metal",
     var EnumerableUtils = __dependency6__["default"];
     var Cache = __dependency7__["default"];
     var create = __dependency8__.create;
-    var platform = __dependency8__.platform;
+    var hasPropertyAccessors = __dependency8__.hasPropertyAccessors;
     var filter = __dependency9__.filter;
     var forEach = __dependency9__.forEach;
     var indexOf = __dependency9__.indexOf;
@@ -2101,10 +2135,8 @@ define("ember-metal",
     var oneWay = __dependency29__.oneWay;
     var run = __dependency30__["default"];
     var libraries = __dependency31__["default"];
-    var isNone = __dependency32__.isNone;
-    var none = __dependency32__.none;
-    var isEmpty = __dependency33__.isEmpty;
-    var empty = __dependency33__.empty;
+    var isNone = __dependency32__["default"];
+    var isEmpty = __dependency33__["default"];
     var isBlank = __dependency34__["default"];
     var isPresent = __dependency35__["default"];
     var keys = __dependency36__["default"];
@@ -2127,7 +2159,10 @@ define("ember-metal",
     Ember.GUID_KEY        = GUID_KEY;
     Ember.create          = create;
     Ember.keys            = keys;
-    Ember.platform        = platform;
+    Ember.platform        = {
+      defineProperty: defineProperty,
+      hasPropertyAccessors: hasPropertyAccessors
+    };
 
     var EmberArrayPolyfills = Ember.ArrayPolyfills = {};
 
@@ -2254,11 +2289,7 @@ define("ember-metal",
     Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
 
     Ember.isNone = isNone;
-    Ember.none = none;
-
     Ember.isEmpty = isEmpty;
-    Ember.empty = empty;
-
     Ember.isBlank = isBlank;
 
     
@@ -3422,21 +3453,20 @@ define("ember-metal/chains",
     __exports__.ChainNode = ChainNode;
   });
 define("ember-metal/computed",
-  ["ember-metal/core","ember-metal/property_set","ember-metal/utils","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/dependent_keys","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+  ["ember-metal/property_set","ember-metal/utils","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/dependent_keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    var set = __dependency2__.set;
-    var meta = __dependency3__.meta;
-    var inspect = __dependency3__.inspect;
-    var expandProperties = __dependency4__["default"];
-    var EmberError = __dependency5__["default"];
-    var Descriptor = __dependency6__.Descriptor;
-    var defineProperty = __dependency6__.defineProperty;
-    var propertyWillChange = __dependency7__.propertyWillChange;
-    var propertyDidChange = __dependency7__.propertyDidChange;
-    var addDependentKeys = __dependency8__.addDependentKeys;
-    var removeDependentKeys = __dependency8__.removeDependentKeys;
+    var set = __dependency1__.set;
+    var meta = __dependency2__.meta;
+    var inspect = __dependency2__.inspect;
+    var expandProperties = __dependency3__["default"];
+    var EmberError = __dependency4__["default"];
+    var Descriptor = __dependency5__.Descriptor;
+    var defineProperty = __dependency5__.defineProperty;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var addDependentKeys = __dependency7__.addDependentKeys;
+    var removeDependentKeys = __dependency7__.removeDependentKeys;
 
     /**
     @module ember-metal
@@ -4039,7 +4069,7 @@ define("ember-metal/computed_macros",
     var set = __dependency3__.set;
     var computed = __dependency4__.computed;
     var isEmpty = __dependency5__["default"];
-    var isNone = __dependency6__.isNone;
+    var isNone = __dependency6__["default"];
     var alias = __dependency7__["default"];
 
     /**
@@ -4763,7 +4793,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.9.0-alpha
+      @version 1.9.0-beta.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -4790,10 +4820,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.9.0-alpha'
+      @default '1.9.0-beta.1'
       @static
     */
-    Ember.VERSION = '1.9.0-alpha';
+    Ember.VERSION = '1.9.0-beta.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -4932,10 +4962,10 @@ define("ember-metal/core",
       @private
       @return {Object}
     */
-    var K = function() { return this; };
-    var K = K;
-    __exports__.K = K;Ember.K = K;
-    //TODO: ES6 GLOBL TODO
+    function K() { return this; }
+    __exports__.K = K;
+    Ember.K = K;
+    //TODO: ES6 GLOBAL TODO
 
     // Stub out the methods defined by the ember-debug package in case it's not loaded
 
@@ -4953,7 +4983,11 @@ define("ember-metal/core",
 define("ember-metal/dependent_keys",
   ["ember-metal/platform","ember-metal/watching","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
-    "use strict";
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
     var o_create = __dependency1__.create;
     var watch = __dependency2__.watch;
     var unwatch = __dependency2__.unwatch;
@@ -5080,16 +5114,18 @@ define("ember-metal/deprecate_property",
     __exports__.deprecateProperty = deprecateProperty;
   });
 define("ember-metal/dictionary",
-  ["exports"],
-  function(__exports__) {
+  ["ember-metal/platform","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    var create = __dependency1__.create;
+
     // the delete is meant to hint at runtimes that this object should remain in
     // dictionary mode. This is clearly a runtime specific hack, but currently it
     // appears worthwile in some usecases. Please note, these deletes do increase
     // the cost of creation dramatically over a plain Object.create. And as this
     // only makes sense for long-lived dictionaries that aren't instantiated often.
     __exports__["default"] = function makeDictionary(parent) {
-      var dict = Object.create(parent);
+      var dict = create(parent);
       dict['_dict'] = null;
       delete dict['_dict'];
       return dict;
@@ -5385,7 +5421,11 @@ define("ember-metal/error",
 define("ember-metal/events",
   ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
-    "use strict";
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
     /**
     @module ember-metal
     */
@@ -6261,19 +6301,17 @@ define("ember-metal/is_blank",
     }
   });
 define("ember-metal/is_empty",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/property_get","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-    var get = __dependency2__.get;
-    var isNone = __dependency3__["default"];
+    var get = __dependency1__.get;
+    var isNone = __dependency2__["default"];
 
     /**
       Verifies that a value is `null` or an empty string, empty array,
       or empty function.
 
-      Constrains the rules on `Ember.isNone` by returning false for empty
+      Constrains the rules on `Ember.isNone` by returning true for empty
       string and empty arrays.
 
       ```javascript
@@ -6292,23 +6330,44 @@ define("ember-metal/is_empty",
       @return {Boolean}
     */
     function isEmpty(obj) {
-      return isNone(obj) || (obj.length === 0 && typeof obj !== 'function') ||
-        (typeof obj === 'object' && get(obj, 'length') === 0);
-    }
+      var none = isNone(obj);
+      if (none) {
+        return none;
+      }
+
+      if (typeof obj.size === 'number') {
+        return !obj.size;
+      }
 
-    var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
+      var objectType = typeof obj;
+
+      if (objectType === 'object') {
+        var size = get(obj, 'size');
+        if (typeof size === 'number') {
+          return !size;
+        }
+      }
+
+      if (typeof obj.length === 'number' && objectType !== 'function') {
+        return !obj.length;
+      }
+
+      if (objectType === 'object') {
+        var length = get(obj, 'length');
+        if (typeof length === 'number') {
+          return !length;
+        }
+      }
+
+      return false;
+    }
 
     __exports__["default"] = isEmpty;
-    __exports__.isEmpty = isEmpty;
-    __exports__.empty = empty;
   });
 define("ember-metal/is_none",
-  ["ember-metal/core","exports"],
-  function(__dependency1__, __exports__) {
+  ["exports"],
+  function(__exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-
     /**
       Returns true if the passed value is null or undefined. This avoids errors
       from JSLint complaining about use of ==, which can be technically
@@ -6332,10 +6391,7 @@ define("ember-metal/is_none",
       return obj === null || obj === undefined;
     }
 
-    var none = Ember.deprecateFunc("Ember.none is deprecated. Please use Ember.isNone instead.", isNone);
-    __exports__.none = none;
     __exports__["default"] = isNone;
-    __exports__.isNone = isNone;
   });
 define("ember-metal/is_present",
   ["ember-metal/is_blank","exports"],
@@ -6675,7 +6731,7 @@ define("ember-metal/map",
     }
 
     function copyNull(obj) {
-      var output = Object.create(null);
+      var output = create(null);
 
       for (var prop in obj) {
         // hasOwnPropery is not needed because obj is Object.create(null);
@@ -6733,7 +6789,7 @@ define("ember-metal/map",
         @method clear
       */
       clear: function() {
-        this.presenceSet = Object.create(null);
+        this.presenceSet = create(null);
         this.list = [];
         this.size = 0;
       },
@@ -6897,7 +6953,7 @@ define("ember-metal/map",
       if (this instanceof this.constructor) {
         this.keys = OrderedSet.create();
         this.keys._silenceRemoveDeprecation = true;
-        this.values = Object.create(null);
+        this.values = create(null);
         this.size = 0;
       } else {
         missingNew("OrderedSet");
@@ -7059,7 +7115,7 @@ define("ember-metal/map",
       */
       clear: function() {
         this.keys.clear();
-        this.values = Object.create(null);
+        this.values = create(null);
         this.size = 0;
       },
 
@@ -7186,7 +7242,11 @@ define("ember-metal/merge",
 define("ember-metal/mixin",
   ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/expand_properties","ember-metal/properties","ember-metal/computed","ember-metal/binding","ember-metal/observer","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
-    "use strict";
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
     /**
     @module ember
     @submodule ember-metal
@@ -7207,6 +7267,7 @@ define("ember-metal/mixin",
     var wrap = __dependency7__.wrap;
     var makeArray = __dependency7__.makeArray;
     var apply = __dependency7__.apply;
+    var isArray = __dependency7__.isArray;
     var expandProperties = __dependency8__["default"];
     var Descriptor = __dependency9__.Descriptor;
     var defineProperty = __dependency9__.defineProperty;
@@ -7389,6 +7450,9 @@ define("ember-metal/mixin",
     function applyMergedProperties(obj, key, value, values) {
       var baseValue = values[key] || obj[key];
 
+      Ember.assert("You passed in `" + JSON.stringify(value) + "` as the value for `" + key +
+                   "` but `" + key + "` cannot be an Array", !isArray(value));
+
       if (!baseValue) { return value; }
 
       var newBase = merge({}, baseValue);
@@ -7512,7 +7576,7 @@ define("ember-metal/mixin",
       stream.subscribe(onNotify);
 
       if (obj._streamBindingSubscriptions === undefined) {
-        obj._streamBindingSubscriptions = Object.create(null);
+        obj._streamBindingSubscriptions = o_create(null);
       }
 
       obj._streamBindingSubscriptions[key] = onNotify;
@@ -8337,108 +8401,48 @@ define("ember-metal/path_cache",
     __exports__.getTailPath = getTailPath;
   });
 define("ember-metal/platform",
-  ["exports"],
-  function(__exports__) {
+  ["ember-metal/platform/define_property","ember-metal/platform/define_properties","ember-metal/platform/create","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    /*globals Node */
+    var hasES5CompliantDefineProperty = __dependency1__.hasES5CompliantDefineProperty;
+    var defineProperty = __dependency1__.defineProperty;
+    var defineProperties = __dependency2__["default"];
+    var create = __dependency3__["default"];
 
     /**
     @module ember-metal
     */
-    var defineProperty = (function checkCompliance(defineProperty) {
-      if (!defineProperty) return;
-      try {
-        var a = 5;
-        var obj = {};
-        defineProperty(obj, 'a', {
-          configurable: true,
-          enumerable: true,
-          get: function () {
-            return a;
-          },
-          set: function (v) {
-            a = v;
-          }
-        });
-        if (obj.a !== 5) return;
-        obj.a = 10;
-        if (a !== 10) return;
 
-        // check non-enumerability
-        defineProperty(obj, 'a', {
-          configurable: true,
-          enumerable: false,
-          writable: true,
-          value: true
-        });
-        for (var key in obj) {
-          if (key === 'a') return;
-        }
-
-        // Detects a bug in Android <3.2 where you cannot redefine a property using
-        // Object.defineProperty once accessors have already been set.
-        if (obj.a !== true) return;
-
-        // defineProperty is compliant
-        return defineProperty;
-      } catch (e) {
-        // IE8 defines Object.defineProperty but calling it on an Object throws
-        return;
-      }
-    })(Object.defineProperty);
-
-    var hasES5CompliantDefineProperty = !!defineProperty;
-
-    if (hasES5CompliantDefineProperty && typeof document !== 'undefined') {
-      // This is for Safari 5.0, which supports Object.defineProperty, but not
-      // on DOM nodes.
-      var canDefinePropertyOnDOM = (function() {
-        try {
-          defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
-          return true;
-        } catch(e) { }
-
-        return false;
-      })();
-
-      if (!canDefinePropertyOnDOM) {
-        defineProperty = function(obj, keyName, desc) {
-          var isNode;
+    var hasPropertyAccessors = hasES5CompliantDefineProperty;
+    var canDefineNonEnumerableProperties = hasES5CompliantDefineProperty;
 
-          if (typeof Node === "object") {
-            isNode = obj instanceof Node;
-          } else {
-            isNode = typeof obj === "object" && typeof obj.nodeType === "number" && typeof obj.nodeName === "string";
-          }
+    /**
+      Platform specific methods and feature detectors needed by the framework.
 
-          if (isNode) {
-            // TODO: Should we have a warning here?
-            return (obj[keyName] = desc.value);
-          } else {
-            return Object.defineProperty(obj, keyName, desc);
-          }
-        };
-      }
-    }
+      @class platform
+      @namespace Ember
+      @static
+    */
 
-    if (!hasES5CompliantDefineProperty) {
-      defineProperty = function defineProperty(obj, keyName, desc) {
-        if (!desc.get) { obj[keyName] = desc.value; }
-      };
-    }
+    __exports__.create = create;
+    __exports__.defineProperty = defineProperty;
+    __exports__.defineProperties = defineProperties;
+    __exports__.hasPropertyAccessors = hasPropertyAccessors;
+    __exports__.canDefineNonEnumerableProperties = canDefineNonEnumerableProperties;
+  });
+define("ember-metal/platform/create",
+  ["exports"],
+  function(__exports__) {
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
 
-    // ES5 15.2.3.7
-    // http://es5.github.com/#x15.2.3.7
-    if (!Object.defineProperties) {
-      Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-          if (properties.hasOwnProperty(property) && property !== "__proto__") {
-            defineProperty(object, property, properties[property]);
-          }
-        }
-        return object;
-      };
-    }
+    /**
+    @class platform
+    @namespace Ember
+    @static
+    */
 
     /**
       Identical to `Object.create()`. Implements if not available natively.
@@ -8520,55 +8524,152 @@ define("ember-metal/platform",
           Object.defineProperties(object, properties);
         }
 
-        return object;
-      };
-    } else {
-      create = Object.create;
-    }
+        return object;
+      };
+    } else {
+      create = Object.create;
+    }
+
+    __exports__["default"] = create;
+  });
+define("ember-metal/platform/define_properties",
+  ["ember-metal/platform/define_property","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var defineProperty = __dependency1__.defineProperty;
+
+    var defineProperties = Object.defineProperties;
+
+    // ES5 15.2.3.7
+    // http://es5.github.com/#x15.2.3.7
+    if (!defineProperties) {
+      defineProperties = function defineProperties(object, properties) {
+        for (var property in properties) {
+          if (properties.hasOwnProperty(property) && property !== "__proto__") {
+            defineProperty(object, property, properties[property]);
+          }
+        }
+        return object;
+      };
+
+      Object.defineProperties = defineProperties;
+    }
+
+    __exports__["default"] = defineProperties;
+  });
+define("ember-metal/platform/define_property",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /*globals Node */
+
+    /**
+    @class platform
+    @namespace Ember
+    @static
+    */
+
+    /**
+      Set to true if the platform supports native getters and setters.
+
+      @property hasPropertyAccessors
+      @final
+    */
+
+    /**
+      Identical to `Object.defineProperty()`. Implements as much functionality
+      as possible if not available natively.
+
+      @method defineProperty
+      @param {Object} obj The object to modify
+      @param {String} keyName property name to modify
+      @param {Object} desc descriptor hash
+      @return {void}
+    */
+    var defineProperty = (function checkCompliance(defineProperty) {
+      if (!defineProperty) return;
+      try {
+        var a = 5;
+        var obj = {};
+        defineProperty(obj, 'a', {
+          configurable: true,
+          enumerable: true,
+          get: function () {
+            return a;
+          },
+          set: function (v) {
+            a = v;
+          }
+        });
+        if (obj.a !== 5) return;
+        obj.a = 10;
+        if (a !== 10) return;
+
+        // check non-enumerability
+        defineProperty(obj, 'a', {
+          configurable: true,
+          enumerable: false,
+          writable: true,
+          value: true
+        });
+        for (var key in obj) {
+          if (key === 'a') return;
+        }
+
+        // Detects a bug in Android <3.2 where you cannot redefine a property using
+        // Object.defineProperty once accessors have already been set.
+        if (obj.a !== true) return;
 
-    var hasPropertyAccessors = hasES5CompliantDefineProperty;
-    var canDefineNonEnumerableProperties = hasES5CompliantDefineProperty;
+        // defineProperty is compliant
+        return defineProperty;
+      } catch (e) {
+        // IE8 defines Object.defineProperty but calling it on an Object throws
+        return;
+      }
+    })(Object.defineProperty);
 
-    /**
-    @class platform
-    @namespace Ember
-    */
+    var hasES5CompliantDefineProperty = !!defineProperty;
 
-    /**
-      Platform specific methods and feature detectors needed by the framework.
+    if (hasES5CompliantDefineProperty && typeof document !== 'undefined') {
+      // This is for Safari 5.0, which supports Object.defineProperty, but not
+      // on DOM nodes.
+      var canDefinePropertyOnDOM = (function() {
+        try {
+          defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
+          return true;
+        } catch(e) { }
 
-      @class platform
-      @namespace Ember
-      @static
-    */
-    // TODO remove this
-    var platform = {};
+        return false;
+      })();
 
-    /**
-      Identical to `Object.defineProperty()`. Implements as much functionality
-      as possible if not available natively.
+      if (!canDefinePropertyOnDOM) {
+        defineProperty = function(obj, keyName, desc) {
+          var isNode;
 
-      @method defineProperty
-      @param {Object} obj The object to modify
-      @param {String} keyName property name to modify
-      @param {Object} desc descriptor hash
-      @return {void}
-    */
-    platform.defineProperty = defineProperty;
+          if (typeof Node === "object") {
+            isNode = obj instanceof Node;
+          } else {
+            isNode = typeof obj === "object" && typeof obj.nodeType === "number" && typeof obj.nodeName === "string";
+          }
 
-    /**
-      Set to true if the platform supports native getters and setters.
+          if (isNode) {
+            // TODO: Should we have a warning here?
+            return (obj[keyName] = desc.value);
+          } else {
+            return Object.defineProperty(obj, keyName, desc);
+          }
+        };
+      }
+    }
 
-      @property hasPropertyAccessors
-      @final
-    */
-    platform.hasPropertyAccessors = hasPropertyAccessors;
+    if (!hasES5CompliantDefineProperty) {
+      defineProperty = function defineProperty(obj, keyName, desc) {
+        if (!desc.get) { obj[keyName] = desc.value; }
+      };
+    }
 
-    __exports__.create = create;
+    __exports__.hasES5CompliantDefineProperty = hasES5CompliantDefineProperty;
     __exports__.defineProperty = defineProperty;
-    __exports__.hasPropertyAccessors = hasPropertyAccessors;
-    __exports__.canDefineNonEnumerableProperties = canDefineNonEnumerableProperties;
-    __exports__.platform = platform;
   });
 define("ember-metal/properties",
   ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","exports"],
@@ -8604,8 +8705,10 @@ define("ember-metal/properties",
     // DEFINING PROPERTIES API
     //
 
-    function MANDATORY_SETTER_FUNCTION(value) {
-      Ember.assert("You must use Ember.set() to access this property (of " + this + ")", false);
+    function MANDATORY_SETTER_FUNCTION(name) {
+      return function SETTER_FUNCTION(value) {
+        Ember.assert("You must use Ember.set() to set the `" + name + "` property (of " + this + ") to `" + value + "`.", false);
+      };
     }
 
     __exports__.MANDATORY_SETTER_FUNCTION = MANDATORY_SETTER_FUNCTION;function DEFAULT_GETTER_FUNCTION(name) {
@@ -8701,7 +8804,7 @@ define("ember-metal/properties",
               objectDefineProperty(obj, keyName, {
                 configurable: true,
                 enumerable: true,
-                set: MANDATORY_SETTER_FUNCTION,
+                set: MANDATORY_SETTER_FUNCTION(keyName),
                 get: DEFAULT_GETTER_FUNCTION(keyName)
               });
             } else {
@@ -9251,7 +9354,10 @@ define("ember-metal/property_set",
             propertyWillChange(obj, keyName);
             
               if (hasPropertyAccessors) {
-                if ((currentValue === undefined && !(keyName in obj)) || !obj.propertyIsEnumerable(keyName)) {
+                if (
+                  (currentValue === undefined && !(keyName in obj)) ||
+                  !Object.prototype.propertyIsEnumerable.call(obj, keyName)
+                ) {
                   defineProperty(obj, keyName, null, value); // setup mandatory setter
                 } else {
                   meta.values[keyName] = value;
@@ -9980,22 +10086,23 @@ define("ember-metal/set_properties",
       ```
 
       @method setProperties
-      @param self
-      @param {Object} hash
-      @return self
+      @param obj
+      @param {Object} properties
+      @return obj
     */
-    __exports__["default"] = function setProperties(self, hash) {
+    __exports__["default"] = function setProperties(obj, properties) {
+      if (!properties || typeof properties !== "object") { return obj; }
       changeProperties(function() {
-        var props = keys(hash);
-        var prop;
+        var props = keys(properties);
+        var propertyName;
 
         for (var i = 0, l = props.length; i < l; i++) {
-          prop = props[i];
+          propertyName = props[i];
 
-          set(self, prop, hash[prop]);
+          set(obj, propertyName, properties[propertyName]);
         }
       });
-      return self;
+      return obj;
     }
   });
 define("ember-metal/streams/read",
@@ -10094,11 +10201,12 @@ define("ember-metal/streams/simple",
     __exports__["default"] = SimpleStream;
   });
 define("ember-metal/streams/stream",
-  ["ember-metal/path_cache","exports"],
-  function(__dependency1__, __exports__) {
+  ["ember-metal/platform","ember-metal/path_cache","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var getFirstKey = __dependency1__.getFirstKey;
-    var getTailPath = __dependency1__.getTailPath;
+    var create = __dependency1__.create;
+    var getFirstKey = __dependency2__.getFirstKey;
+    var getTailPath = __dependency2__.getTailPath;
 
     var NIL = function NIL(){};
 
@@ -10120,7 +10228,7 @@ define("ember-metal/streams/stream",
         var tailPath = getTailPath(path);
 
         if (this.children === undefined) {
-          this.children = Object.create(null);
+          this.children = create(null);
         }
 
         var keyStream = this.children[firstKey];
@@ -10310,7 +10418,11 @@ define("ember-metal/streams/stream_binding",
 define("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
-    "use strict";
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
     var Ember = __dependency1__["default"];
     var o_defineProperty = __dependency2__.defineProperty;
     var canDefineNonEnumerableProperties = __dependency2__.canDefineNonEnumerableProperties;
@@ -10781,8 +10893,8 @@ define("ember-metal/utils",
 
     /**
       Forces the passed object to be part of an array. If the object is already
-      an array or array-like, returns the object. Otherwise adds the object to
-      an array. If obj is `null` or `undefined`, returns an empty array.
+      an array or array-like, it will return the object. Otherwise, it will add the object to
+      an array. If obj is `null` or `undefined`, it will return an empty array.
 
       ```javascript
       Ember.makeArray();            // []
@@ -11221,13 +11333,16 @@ define("ember-metal/watch_key",
     __exports__.watchKey = watchKey;
     
       var handleMandatorySetter = function handleMandatorySetter(m, obj, keyName) {
+        var descriptor = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, keyName);
+        var configurable = descriptor ? descriptor.configurable : true;
+
         // this x in Y deopts, so keeping it in this function is better;
-        if (keyName in obj) {
+        if (configurable && keyName in obj) {
           m.values[keyName] = obj[keyName];
           o_defineProperty(obj, keyName, {
             configurable: true,
-            enumerable: obj.propertyIsEnumerable(keyName),
-            set: MANDATORY_SETTER_FUNCTION,
+            enumerable: Object.prototype.propertyIsEnumerable.call(obj, keyName),
+            set: MANDATORY_SETTER_FUNCTION(keyName),
             get: DEFAULT_GETTER_FUNCTION(keyName)
           });
         }
@@ -11251,7 +11366,7 @@ define("ember-metal/watch_key",
           if (hasPropertyAccessors && keyName in obj) {
             o_defineProperty(obj, keyName, {
               configurable: true,
-              enumerable: obj.propertyIsEnumerable(keyName),
+              enumerable: Object.prototype.propertyIsEnumerable.call(obj, keyName),
               set: function(val) {
                 // redefine to set as enumerable
                 o_defineProperty(obj, keyName, {
@@ -11332,9 +11447,7 @@ define("ember-metal/watching",
     @module ember-metal
     */
 
-    var GUID_KEY = __dependency1__.GUID_KEY;
     var typeOf = __dependency1__.typeOf;
-    var generateGuid = __dependency1__.generateGuid;
     var removeChainWatcher = __dependency2__.removeChainWatcher;
     var flushPendingChains = __dependency2__.flushPendingChains;
     var watchKey = __dependency3__.watchKey;
@@ -11388,31 +11501,7 @@ define("ember-metal/watching",
       }
     }
 
-    __exports__.unwatch = unwatch;/**
-      Call on an object when you first beget it from another object. This will
-      setup any chained watchers on the object instance as needed. This method is
-      safe to call multiple times.
-
-      @private
-      @method rewatch
-      @for Ember
-      @param obj
-    */
-    function rewatch(obj) {
-      var m = obj['__ember_meta__'], chains = m && m.chains;
-
-      // make sure the object has its own guid.
-      if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
-        generateGuid(obj);
-      }
-
-      // make sure any chained watchers update.
-      if (chains && chains.value() !== obj) {
-        m.chains = chains.copy(obj);
-      }
-    }
-
-    __exports__.rewatch = rewatch;var NODE_STACK = [];
+    __exports__.unwatch = unwatch;var NODE_STACK = [];
 
     /**
       Tears down the meta on an object so that it can be garbage collected.
@@ -11550,10 +11639,7 @@ define("ember-runtime",
     Ember.copy = copy;
     Ember.isEqual = isEqual;
 
-    if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-      Ember.inject = inject;
-    }
-
+    
     Ember.Array = EmberArray;
 
     Ember.Comparable = Comparable;
@@ -11625,10 +11711,7 @@ define("ember-runtime",
     Ember.Controller = Controller;
     Ember.ControllerMixin = ControllerMixin;
 
-    if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-      Ember.Service = Service;
-    }
-
+    
     Ember._ProxyMixin = _ProxyMixin;
 
     Ember.RSVP = RSVP;
@@ -12218,6 +12301,7 @@ define("ember-runtime/computed/reduce_computed",
           this.setValue(removedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       },
 
       dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
@@ -12249,7 +12333,7 @@ define("ember-runtime/computed/reduce_computed",
           this.setValue(addedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }, this);
-
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
         this.trackAdd(dependentKey, normalizedIndex, observerContexts);
       },
 
@@ -12293,6 +12377,7 @@ define("ember-runtime/computed/reduce_computed",
         }
 
         this.changedItems = {};
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       }
     };
 
@@ -12329,6 +12414,7 @@ define("ember-runtime/computed/reduce_computed",
         meta.setValue( callbacks.addedItem.call(
           this, meta.getValue(), item, new ChangeMeta(dependentArray, item, index, propertyName, cp, dependentArray.length), meta.sugarMeta));
       }, this);
+      callbacks.flushedChanges.call(this, meta.getValue(), meta.sugarMeta);
     }
 
     function reset(cp, propertyName) {
@@ -12504,7 +12590,8 @@ define("ember-runtime/computed/reduce_computed",
 
         this.callbacks = {
           removedItem: options.removedItem || defaultCallback,
-          addedItem: options.addedItem || defaultCallback
+          addedItem: options.addedItem || defaultCallback,
+          flushedChanges: options.flushedChanges || defaultCallback
         };
       }
 
@@ -12797,8 +12884,8 @@ define("ember-runtime/computed/reduce_computed",
     __exports__.reduceComputed = reduceComputed;
   });
 define("ember-runtime/computed/reduce_computed_macros",
-  ["ember-metal/core","ember-metal/merge","ember-metal/property_get","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/object_proxy","ember-runtime/system/subarray","ember-metal/keys","ember-runtime/compare","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/subarray","ember-metal/keys","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -12807,20 +12894,18 @@ define("ember-runtime/computed/reduce_computed_macros",
 
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var merge = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var isArray = __dependency4__.isArray;
-    var guidFor = __dependency4__.guidFor;
-    var EmberError = __dependency5__["default"];
-    var forEach = __dependency6__.forEach;
-    var run = __dependency7__["default"];
-    var addObserver = __dependency8__.addObserver;
-    var arrayComputed = __dependency9__.arrayComputed;
-    var reduceComputed = __dependency10__.reduceComputed;
-    var ObjectProxy = __dependency11__["default"];
-    var SubArray = __dependency12__["default"];
-    var keys = __dependency13__["default"];
-    var compare = __dependency14__["default"];
+    var get = __dependency2__.get;
+    var isArray = __dependency3__.isArray;
+    var guidFor = __dependency3__.guidFor;
+    var EmberError = __dependency4__["default"];
+    var forEach = __dependency5__.forEach;
+    var run = __dependency6__["default"];
+    var addObserver = __dependency7__.addObserver;
+    var arrayComputed = __dependency8__.arrayComputed;
+    var reduceComputed = __dependency9__.reduceComputed;
+    var SubArray = __dependency10__["default"];
+    var keys = __dependency11__["default"];
+    var compare = __dependency12__["default"];
 
     var a_slice = [].slice;
 
@@ -13399,8 +13484,8 @@ define("ember-runtime/computed/reduce_computed_macros",
       mid = low + Math.floor((high - low) / 2);
       midItem = array.objectAt(mid);
 
-      guidMid = _guidFor(midItem);
-      guidItem = _guidFor(item);
+      guidMid = guidFor(midItem);
+      guidItem = guidFor(item);
 
       if (guidMid === guidItem) {
         return mid;
@@ -13420,19 +13505,9 @@ define("ember-runtime/computed/reduce_computed_macros",
       }
 
       return mid;
-
-      function _guidFor(item) {
-        if (SearchProxy.detectInstance(item)) {
-          return guidFor(get(item, 'content'));
-        }
-
-        return guidFor(item);
-      }
     }
 
 
-    var SearchProxy = ObjectProxy.extend();
-
     /**
       A computed property which returns a new array with all the
       properties from the first dependent array sorted based on a property
@@ -13501,17 +13576,53 @@ define("ember-runtime/computed/reduce_computed_macros",
       Ember.assert('Ember.computed.sort requires two arguments: an array key to sort and ' +
         'either a sort properties key or sort function', arguments.length === 2);
 
-      var initFn, sortPropertiesKey;
-
       if (typeof sortDefinition === 'function') {
-        initFn = function (array, changeMeta, instanceMeta) {
-          instanceMeta.order = sortDefinition;
-          instanceMeta.binarySearch = binarySearch;
-        };
+        return customSort(itemsKey, sortDefinition);
       } else {
-        sortPropertiesKey = sortDefinition;
+        return propertySort(itemsKey, sortDefinition);
+      }
+    }
+
+    __exports__.sort = sort;function customSort(itemsKey, comparator) {
+      return arrayComputed(itemsKey, {
+        initialize: function (array, changeMeta, instanceMeta) {
+          instanceMeta.order = comparator;
+          instanceMeta.binarySearch = binarySearch;
+          instanceMeta.waitingInsertions = [];
+          instanceMeta.insertWaiting = function() {
+            var index, item;
+            var waiting = instanceMeta.waitingInsertions;
+            instanceMeta.waitingInsertions = [];
+            for (var i=0; i<waiting.length; i++) {
+              item = waiting[i];
+              index = instanceMeta.binarySearch(array, item);
+              array.insertAt(index, item);
+            }
+          };
+          instanceMeta.insertLater = function(item) {
+            this.waitingInsertions.push(item);
+          };
+        },
+
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          instanceMeta.insertLater(item);
+          return array;
+        },
+
+        removedItem: function (array, item, changeMeta, instanceMeta) {
+          array.removeObject(item);
+          return array;
+        },
+
+        flushedChanges: function(array, instanceMeta) {
+          instanceMeta.insertWaiting();
+        }
+      });
+    }
 
-        initFn = function (array, changeMeta, instanceMeta) {
+    function propertySort(itemsKey, sortPropertiesKey) {
+      return arrayComputed(itemsKey, {
+        initialize: function (array, changeMeta, instanceMeta) {
           function setupSortProperties() {
             var sortPropertyDefinitions = get(this, sortPropertiesKey);
             var sortProperties = instanceMeta.sortProperties = [];
@@ -13519,7 +13630,7 @@ define("ember-runtime/computed/reduce_computed_macros",
             var sortProperty, idx, asc;
 
             Ember.assert('Cannot sort: \'' + sortPropertiesKey + '\' is not an array.',
-              isArray(sortPropertyDefinitions));
+                         isArray(sortPropertyDefinitions));
 
             changeMeta.property.clearItemPropertyKeys(itemsKey);
 
@@ -13553,12 +13664,14 @@ define("ember-runtime/computed/reduce_computed_macros",
           setupSortProperties.call(this);
 
           instanceMeta.order = function (itemA, itemB) {
-            var isProxy = itemB instanceof SearchProxy;
             var sortProperty, result, asc;
+            var keyA = this.keyFor(itemA);
+            var keyB = this.keyFor(itemB);
 
             for (var i = 0; i < this.sortProperties.length; ++i) {
               sortProperty = this.sortProperties[i];
-              result = compare(get(itemA, sortProperty), isProxy ? itemB[sortProperty] : get(itemB, sortProperty));
+
+              result = compare(keyA[sortProperty], keyB[sortProperty]);
 
               if (result !== 0) {
                 asc = this.sortPropertyAscending[sortProperty];
@@ -13570,39 +13683,46 @@ define("ember-runtime/computed/reduce_computed_macros",
           };
 
           instanceMeta.binarySearch = binarySearch;
-        };
-      }
-
-      return arrayComputed(itemsKey, {
-        initialize: initFn,
+          setupKeyCache(instanceMeta);
+        },
 
         addedItem: function (array, item, changeMeta, instanceMeta) {
           var index = instanceMeta.binarySearch(array, item);
           array.insertAt(index, item);
-
           return array;
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var proxyProperties, index, searchItem;
-
-          if (changeMeta.previousValues) {
-            proxyProperties = merge({ content: item }, changeMeta.previousValues);
-
-            searchItem = SearchProxy.create(proxyProperties);
-          } else {
-            searchItem = item;
-          }
-
-          index = instanceMeta.binarySearch(array, searchItem);
+          var index = instanceMeta.binarySearch(array, item);
           array.removeAt(index);
-
+          instanceMeta.dropKeyFor(item);
           return array;
         }
       });
     }
 
-    __exports__.sort = sort;
+    function setupKeyCache(instanceMeta) {
+      instanceMeta.keyFor = function(item) {
+        var guid = guidFor(item);
+        if (this.keyCache[guid]) {
+          return this.keyCache[guid];
+        }
+        var sortProperty;
+        var key = {};
+        for (var i = 0; i < this.sortProperties.length; ++i) {
+          sortProperty = this.sortProperties[i];
+          key[sortProperty] = get(item, sortProperty);
+        }
+        return this.keyCache[guid] = key;
+      };
+
+      instanceMeta.dropKeyFor = function(item) {
+        var guid = guidFor(item);
+        this.keyCache[guid] = null;
+      };
+
+      instanceMeta.keyCache = {};
+    }
   });
 define("ember-runtime/controllers/array_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/enumerable_utils","ember-runtime/system/array_proxy","ember-runtime/mixins/sortable","ember-runtime/mixins/controller","ember-metal/computed","ember-metal/error","exports"],
@@ -13848,28 +13968,7 @@ define("ember-runtime/controllers/array_controller",
           parentController = this;
         }
 
-        if (Ember.FEATURES.isEnabled("ember-runtime-item-controller-inline-class")) {
-          options = {
-            target: parentController,
-            parentController: parentController,
-            model: object
-          };
-
-          if (typeof controllerClass === 'string') {
-            fullName = 'controller:' + controllerClass;
-
-            if (!container.has(fullName)) {
-              throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
-            }
-
-            subControllerFactory = container.lookupFactory(fullName);
-          } else {
-            subControllerFactory = controllerClass;
-            options.container = container;
-          }
-
-          subController = subControllerFactory.create(options);
-        } else {
+        
           fullName = 'controller:' + controllerClass;
 
           if (!container.has(fullName)) {
@@ -13881,7 +13980,7 @@ define("ember-runtime/controllers/array_controller",
             parentController: parentController,
             model: object
           });
-        }
+        
 
         subControllers[idx] = subController;
 
@@ -13936,42 +14035,12 @@ define("ember-runtime/controllers/controller",
     */
     var Controller = EmberObject.extend(Mixin);
 
-    if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-      /**
-        Creates a property that lazily looks up another controller in the container.
-        Can only be used when defining another controller.
-
-        Example:
-
-        ```javascript
-        App.PostController = Ember.Controller.extend({
-          posts: Ember.inject.controller()
-        });
-        ```
-
-        This example will create a `posts` property on the `post` controller that
-        looks up the `posts` controller in the container, making it easy to
-        reference other controllers. This is functionally equivalent to:
-
-        ```javascript
-        App.PostController = Ember.Controller.extend({
-          needs: 'posts',
-          posts: Ember.computed.alias('controllers.posts')
-        });
-        ```
-
-        @method inject.controller
-        @for Ember
-        @param {String} name (optional) name of the controller to inject, defaults
-               to the property's name
-        @return {Ember.InjectedProperty} injection descriptor instance
-        */
-      createInjectionHelper('controller', function(factory) {
-        Ember.assert("Defining an injected controller property on a " +
-                     "non-controller is not allowed.", Controller.detect(factory));
-      });
+    function controllerInjectionHelper(factory) {
+      Ember.assert("Defining an injected controller property on a " +
+                   "non-controller is not allowed.", Controller.detect(factory));
     }
 
+    
     __exports__["default"] = Controller;
   });
 define("ember-runtime/controllers/object_controller",
@@ -14405,7 +14474,7 @@ define("ember-runtime/ext/rsvp",
     };
 
     RSVP.onerrorDefault = function (error) {
-      if (error instanceof Error) {
+      if (error && error.name !== 'TransitionAborted') {
         if (Ember.testing) {
           // ES6TODO: remove when possible
           if (!Test && Ember.__loader.registry[testModuleName]) {
@@ -14414,6 +14483,7 @@ define("ember-runtime/ext/rsvp",
 
           if (Test && Test.adapter) {
             Test.adapter.exception(error);
+            Logger.error(error.stack);
           } else {
             throw error;
           }
@@ -14888,12 +14958,7 @@ define("ember-runtime/mixins/action_handler",
         @method willMergeMixin
       */
       willMergeMixin: function(props) {
-        if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-          // Calling super is only OK here since we KNOW that there is another
-          // Mixin loaded first (injection dependency verification)
-          this._super.apply(this, arguments);
-        }
-
+        
         var hashName;
 
         if (!props._actions) {
@@ -14984,7 +15049,7 @@ define("ember-runtime/mixins/array",
     var get = __dependency2__.get;
     var computed = __dependency3__.computed;
     var cacheFor = __dependency3__.cacheFor;
-    var isNone = __dependency4__.isNone;
+    var isNone = __dependency4__["default"];
     var Enumerable = __dependency5__["default"];
     var map = __dependency6__.map;
     var Mixin = __dependency7__.Mixin;
@@ -17733,7 +17798,7 @@ define("ember-runtime/mixins/observable",
     var removeObserver = __dependency10__.removeObserver;
     var observersFor = __dependency10__.observersFor;
     var cacheFor = __dependency11__.cacheFor;
-    var isNone = __dependency12__.isNone;
+    var isNone = __dependency12__["default"];
 
 
     var slice = Array.prototype.slice;
@@ -18451,13 +18516,13 @@ define("ember-runtime/mixins/sortable",
     var computed = __dependency8__.computed;
     var beforeObserver = __dependency4__.beforeObserver;
     var observer = __dependency4__.observer;
-    //ES6TODO: should we access these directly from their package or from how thier exposed in ember-metal?
+    //ES6TODO: should we access these directly from their package or from how their exposed in ember-metal?
 
     /**
       `Ember.SortableMixin` provides a standard interface for array proxies
       to specify a sort order and maintain this sorting when objects are added,
       removed, or updated without changing the implicit order of their underlying
-      modelarray:
+      model array:
 
       ```javascript
       songs = [
@@ -18489,8 +18554,8 @@ define("ember-runtime/mixins/sortable",
       songsController.get('firstObject'); // {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'}
       ```
 
-      SortableMixin works by sorting the arrangedContent array, which is the array that
-      arrayProxy displays. Due to the fact that the underlying 'content' array is not changed, that
+      `SortableMixin` works by sorting the `arrangedContent` array, which is the array that
+      `ArrayProxy` displays. Due to the fact that the underlying 'content' array is not changed, that
       array will not display the sorted list:
 
        ```javascript
@@ -18498,8 +18563,8 @@ define("ember-runtime/mixins/sortable",
       songsController.get('firstObject'); // Returns the sorted content.
       ```
 
-      Although the sorted content can also be accessed through the arrangedContent property,
-      it is preferable to use the proxied class and not the arrangedContent array directly.
+      Although the sorted content can also be accessed through the `arrangedContent` property,
+      it is preferable to use the proxied class and not the `arrangedContent` array directly.
 
       @class SortableMixin
       @namespace Ember
@@ -18508,7 +18573,7 @@ define("ember-runtime/mixins/sortable",
     __exports__["default"] = Mixin.create(MutableEnumerable, {
 
       /**
-        Specifies which properties dictate the arrangedContent's sort order.
+        Specifies which properties dictate the `arrangedContent`'s sort order.
 
         When specifying multiple properties the sorting will use properties
         from the `sortProperties` array prioritized from first to last.
@@ -18518,7 +18583,7 @@ define("ember-runtime/mixins/sortable",
       sortProperties: null,
 
       /**
-        Specifies the arrangedContent's sort direction.
+        Specifies the `arrangedContent`'s sort direction.
         Sorts the content in ascending order by default. Set to `false` to
         use descending order.
 
@@ -18530,13 +18595,14 @@ define("ember-runtime/mixins/sortable",
       /**
         The function used to compare two values. You can override this if you
         want to do custom comparisons. Functions must be of the type expected by
-        Array#sort, i.e.
-          return 0 if the two parameters are equal,
-          return a negative value if the first parameter is smaller than the second or
-          return a positive value otherwise:
+        Array#sort, i.e.,
+
+        *  return 0 if the two parameters are equal,
+        *  return a negative value if the first parameter is smaller than the second or
+        *  return a positive value otherwise:
 
         ```javascript
-        function(x,y) { // These are assumed to be integers
+        function(x, y) { // These are assumed to be integers
           if (x === y)
             return 0;
           return x < y ? -1 : 1;
@@ -18587,12 +18653,11 @@ define("ember-runtime/mixins/sortable",
       isSorted: computed.notEmpty('sortProperties'),
 
       /**
-        Overrides the default arrangedContent from arrayProxy in order to sort by sortFunction.
-        Also sets up observers for each sortProperty on each item in the content Array.
+        Overrides the default `arrangedContent` from `ArrayProxy` in order to sort by `sortFunction`.
+        Also sets up observers for each `sortProperty` on each item in the content Array.
 
         @property arrangedContent
       */
-
       arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
         var content = get(this, 'content');
         var isSorted = get(this, 'isSorted');
@@ -19280,9 +19345,13 @@ define("ember-runtime/system/container",
     __exports__["default"] = Container;
   });
 define("ember-runtime/system/core_object",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/injected_property","ember-metal/run_loop","exports"],
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/platform","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/injected_property","ember-metal/run_loop","ember-metal/watching","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
-    "use strict";
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
     /**
       @module ember
       @submodule ember-runtime
@@ -19301,23 +19370,23 @@ define("ember-runtime/system/core_object",
     var GUID_KEY = __dependency3__.GUID_KEY;
     var meta = __dependency3__.meta;
     var makeArray = __dependency3__.makeArray;
-    var rewatch = __dependency5__.rewatch;
-    var finishChains = __dependency6__.finishChains;
-    var sendEvent = __dependency7__.sendEvent;
-    var IS_BINDING = __dependency8__.IS_BINDING;
-    var Mixin = __dependency8__.Mixin;
-    var required = __dependency8__.required;
-    var indexOf = __dependency9__.indexOf;
-    var EmberError = __dependency10__["default"];
+    var finishChains = __dependency5__.finishChains;
+    var sendEvent = __dependency6__.sendEvent;
+    var IS_BINDING = __dependency7__.IS_BINDING;
+    var Mixin = __dependency7__.Mixin;
+    var required = __dependency7__.required;
+    var indexOf = __dependency8__.indexOf;
+    var EmberError = __dependency9__["default"];
     var o_defineProperty = __dependency4__.defineProperty;
-    var keys = __dependency11__["default"];
-    var ActionHandler = __dependency12__["default"];
-    var defineProperty = __dependency13__.defineProperty;
-    var Binding = __dependency14__.Binding;
-    var ComputedProperty = __dependency15__.ComputedProperty;
-    var InjectedProperty = __dependency16__["default"];
-    var run = __dependency17__["default"];
-    var destroy = __dependency5__.destroy;
+    var keys = __dependency10__["default"];
+    var ActionHandler = __dependency11__["default"];
+    var defineProperty = __dependency12__.defineProperty;
+    var Binding = __dependency13__.Binding;
+    var ComputedProperty = __dependency14__.ComputedProperty;
+    var computed = __dependency14__.computed;
+    var InjectedProperty = __dependency15__["default"];
+    var run = __dependency16__["default"];
+    var destroy = __dependency17__.destroy;
     var K = __dependency1__.K;
     var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
 
@@ -19470,7 +19539,6 @@ define("ember-runtime/system/core_object",
         if (!wasApplied) {
           wasApplied = true;
           Class.PrototypeMixin.applyPartial(Class.prototype);
-          rewatch(Class.prototype);
         }
 
         return this.prototype;
@@ -20068,7 +20136,7 @@ define("ember-runtime/system/core_object",
         return desc._meta || {};
       },
 
-      _computedProperties: Ember.computed(function() {
+      _computedProperties: computed(function() {
         hasCachedComputedProperties = true;
         var proto = this.proto();
         var descs = meta(proto).descs;
@@ -20110,31 +20178,7 @@ define("ember-runtime/system/core_object",
       }
     };
 
-    if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-      /**
-        Returns a hash of property names and container names that injected
-        properties will lookup on the container lazily.
-
-        @method lazyInjections
-        @return {Object} Hash of all lazy injected property keys to container names
-      */
-      ClassMixinProps.lazyInjections = function() {
-        var injections = {};
-        var proto = this.proto();
-        var descs = meta(proto).descs;
-        var key, desc;
-
-        for (key in descs) {
-          desc = descs[key];
-          if (desc instanceof InjectedProperty) {
-            injections[key] = desc.type + ':' + (desc.name || key);
-          }
-        }
-
-        return injections;
-      };
-    }
-
+    
     var ClassMixin = Mixin.create(ClassMixinProps);
 
     ClassMixin.ownerConstructor = CoreObject;
@@ -20924,22 +20968,13 @@ define("ember-runtime/system/object",
       return "Ember.Object";
     };
 
-    if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-      EmberObject.reopen({
-        /**
-          Provides mixin-time validation for injected properties.
-
-          @private
-          @method willMergeMixin
-        */
-        willMergeMixin: function(props) {
-          // Injection validations are a debugging aid only, so ensure that they are
-          // not performed in production builds by invoking from an assertion
-          Ember.assert("Injected properties are invalid", validatePropertyInjections(this.constructor, props));
-        }
-      });
+    function injectedPropertyAssertion(props) {
+      // Injection validations are a debugging aid only, so ensure that they are
+      // not performed in production builds by invoking from an assertion
+      Ember.assert("Injected properties are invalid", validatePropertyInjections(this.constructor, props));
     }
 
+    
     __exports__["default"] = EmberObject;
   });
 define("ember-runtime/system/object_proxy",
@@ -21029,43 +21064,7 @@ define("ember-runtime/system/service",
 
     var Service;
 
-    if (Ember.FEATURES.isEnabled('ember-metal-injected-properties')) {
-      /**
-        @class Service
-        @namespace Ember
-        @extends Ember.Object
-      */
-      Service = Object.extend();
-
-      /**
-        Creates a property that lazily looks up a service in the container. There
-        are no restrictions as to what objects a service can be injected into.
-
-        Example:
-
-        ```javascript
-        App.ApplicationRoute = Ember.Route.extend({
-          authManager: Ember.inject.service('auth'),
-
-          model: function() {
-            return this.get('authManager').findCurrentUser();
-          }
-        });
-        ```
-
-        This example will create an `authManager` property on the application route
-        that looks up the `auth` service in the container, making it easily
-        accessible in the `model` hook.
-
-        @method inject.service
-        @for Ember
-        @param {String} name (optional) name of the service to inject, defaults to
-               the property's name
-        @return {Ember.InjectedProperty} injection descriptor instance
-      */
-      createInjectionHelper('service');
-    }
-
+    
     __exports__["default"] = Service;
   });
 define("ember-runtime/system/set",
@@ -21082,7 +21081,7 @@ define("ember-runtime/system/set",
     var get = __dependency2__.get;
     var set = __dependency3__.set;
     var guidFor = __dependency4__.guidFor;
-    var isNone = __dependency5__.isNone;
+    var isNone = __dependency5__["default"];
     var fmt = __dependency6__.fmt;
     var CoreObject = __dependency7__["default"];
     var MutableEnumerable = __dependency8__["default"];