ember-source 1.6.0.beta.5 → 1.6.0

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.6.0-beta.5
+ * @version   1.6.0
  */
 
 
@@ -1064,9 +1064,7 @@ define("ember-metal/computed",
 
     function UNDEFINED() { }
 
-    
-      var lengthPattern = /\.(length|\[\])$/;
-    
+    var lengthPattern = /\.(length|\[\])$/;
 
     // ..........................................................
     // DEPENDENT KEYS
@@ -1074,9 +1072,9 @@ define("ember-metal/computed",
 
     // data structure:
     //  meta.deps = {
-    //   'depKey': {
-    //     'keyName': count,
-    //   }
+    //    'depKey': {
+    //      'keyName': count,
+    //    }
     //  }
 
     /*
@@ -1160,7 +1158,7 @@ define("ember-metal/computed",
       values.
 
       ```javascript
-      Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         // these will be supplied by `create`
         firstName: null,
         lastName: null,
@@ -1187,8 +1185,7 @@ define("ember-metal/computed",
       third parameter.
 
       ```javascript
-
-     Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         // these will be supplied by `create`
         firstName: null,
         lastName: null,
@@ -1203,7 +1200,7 @@ define("ember-metal/computed",
 
           // setter
           } else {
-            var name = value.split(" ");
+            var name = value.split(' ');
 
             this.set('firstName', name[0]);
             this.set('lastName', name[1]);
@@ -1214,9 +1211,10 @@ define("ember-metal/computed",
       });
 
       var person = Person.create();
+
       person.set('fullName', 'Peter Wagenet');
-      person.get('firstName') // 'Peter'
-      person.get('lastName') // 'Wagenet'
+      person.get('firstName'); // 'Peter'
+      person.get('lastName');  // 'Wagenet'
       ```
 
       @class ComputedProperty
@@ -1265,7 +1263,7 @@ define("ember-metal/computed",
       mode the computed property will not automatically cache the return value.
 
       ```javascript
-      MyApp.outsideService = Ember.Object.extend({
+      var outsideService = Ember.Object.extend({
         value: function() {
           return OutsideService.getValue();
         }.property().volatile()
@@ -1285,15 +1283,15 @@ define("ember-metal/computed",
       mode the computed property will throw an error when set.
 
       ```javascript
-      MyApp.Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         guid: function() {
           return 'guid-guid-guid';
         }.property().readOnly()
       });
 
-      MyApp.person = MyApp.Person.create();
+      var person = Person.create();
 
-      MyApp.person.set('guid', 'new-guid'); // will throw an exception
+      person.set('guid', 'new-guid'); // will throw an exception
       ```
 
       @method readOnly
@@ -1310,7 +1308,7 @@ define("ember-metal/computed",
       arguments containing key paths that this computed property depends on.
 
       ```javascript
-      MyApp.President = Ember.Object.extend({
+      var President = Ember.Object.extend({
         fullName: computed(function() {
           return this.get('firstName') + ' ' + this.get('lastName');
 
@@ -1319,12 +1317,12 @@ define("ember-metal/computed",
         }).property('firstName', 'lastName')
       });
 
-      MyApp.president = MyApp.President.create({
+      var president = President.create({
         firstName: 'Barack',
         lastName: 'Obama',
       });
 
-      MyApp.president.get('fullName'); // 'Barack Obama'
+      president.get('fullName'); // 'Barack Obama'
       ```
 
       @method property
@@ -1408,10 +1406,9 @@ define("ember-metal/computed",
       Otherwise, call the function passing the property name as an argument.
 
       ```javascript
-      Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         fullName: function(keyName) {
           // the keyName parameter is 'fullName' in this case.
-
           return this.get('firstName') + ' ' + this.get('lastName');
         }.property('firstName', 'lastName')
       });
@@ -1662,38 +1659,39 @@ define("ember-metal/computed",
       };
     };
 
-    
-      /**
-        A computed property that returns true if the value of the dependent
-        property is null, an empty string, empty array, or empty function.
+    /**
+      A computed property that returns true if the value of the dependent
+      property is null, an empty string, empty array, or empty function.
 
-        Example
+      Example
 
-        ```javascript
-        var ToDoList = Ember.Object.extend({
-          done: Ember.computed.empty('todos')
-        });
+      ```javascript
+      var ToDoList = Ember.Object.extend({
+        done: Ember.computed.empty('todos')
+      });
 
-        var todoList = ToDoList.create({todos: ['Unit Test', 'Documentation', 'Release']});
+      var todoList = ToDoList.create({
+        todos: ['Unit Test', 'Documentation', 'Release']
+      });
 
-        todoList.get('done'); // false
-        todoList.get('todos').clear();
-        todoList.get('done'); // true
-        ```
+      todoList.get('done'); // false
+      todoList.get('todos').clear();
+      todoList.get('done'); // true
+      ```
+
+      @since 1.6.0
+      @method computed.empty
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which negate
+      the original value for property
+    */
+    computed.empty = function (dependentKey) {
+      return computed(dependentKey + '.length', function () {
+        return isEmpty(get(this, dependentKey));
+      });
+    };
 
-        @since 1.6.0
-        @method computed.empty
-        @for Ember
-        @param {String} dependentKey
-        @return {Ember.ComputedProperty} computed property which negate
-        the original value for property
-      */
-      computed.empty = function (dependentKey) {
-        return computed(dependentKey + '.length', function () {
-          return isEmpty(get(this, dependentKey));
-        });
-      };
-    
     /**
       A computed property that returns true if the value of the dependent
       property is NOT null, an empty string, empty array, or empty function.
@@ -1709,11 +1707,11 @@ define("ember-metal/computed",
         hasStuff: Ember.computed.notEmpty('backpack.[]')
       });
 
-      var hamster = Hamster.create({backpack: ['Food', 'Sleeping Bag', 'Tent']});
+      var hamster = Hamster.create({ backpack: ['Food', 'Sleeping Bag', 'Tent'] });
 
-      hamster.get('hasStuff'); // true
+      hamster.get('hasStuff');         // true
       hamster.get('backpack').clear(); // []
-      hamster.get('hasStuff'); // false
+      hamster.get('hasStuff');         // false
       ```
 
       @method computed.notEmpty
@@ -2149,12 +2147,12 @@ define("ember-metal/computed",
       though they were called on the original property.
 
       ```javascript
-      Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         name: 'Alex Matchneer',
         nomen: Ember.computed.alias('name')
       });
 
-      alex = Person.create();
+      var alex = Person.create();
 
       alex.get('nomen'); // 'Alex Matchneer'
       alex.get('name');  // 'Alex Matchneer'
@@ -2201,9 +2199,9 @@ define("ember-metal/computed",
         lastName:  'Zeenny'
       });
 
-      teddy.get('nickName'); // 'Teddy'
+      teddy.get('nickName');              // 'Teddy'
       teddy.set('nickName', 'TeddyBear'); // 'TeddyBear'
-      teddy.get('firstName'); // 'Teddy'
+      teddy.get('firstName');             // 'Teddy'
       ```
 
       @method computed.oneWay
@@ -2240,10 +2238,10 @@ define("ember-metal/computed",
         lastName:  'Zeenny'
       });
 
-      teddy.get('nickName'); // 'Teddy'
+      teddy.get('nickName');              // 'Teddy'
       teddy.set('nickName', 'TeddyBear'); // throws Exception
       // throw new Ember.Error('Cannot Set: nickName on: <User:ember27288>' );`
-      teddy.get('firstName'); // 'Teddy'
+      teddy.get('firstName');             // 'Teddy'
       ```
 
       @method computed.readOnly
@@ -2270,12 +2268,12 @@ define("ember-metal/computed",
         wishList: Ember.computed.defaultTo('favoriteFood')
       });
 
-      var hamster = Hamster.create({favoriteFood: 'Banana'});
+      var hamster = Hamster.create({ favoriteFood: 'Banana' });
 
-      hamster.get('wishList'); // 'Banana'
+      hamster.get('wishList');                     // 'Banana'
       hamster.set('wishList', 'More Unit Tests');
-      hamster.get('wishList'); // 'More Unit Tests'
-      hamster.get('favoriteFood'); // 'Banana'
+      hamster.get('wishList');                     // 'More Unit Tests'
+      hamster.get('favoriteFood');                 // 'Banana'
       ```
 
       @method computed.defaultTo
@@ -2326,7 +2324,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.6.0-beta.5
+      @version 1.6.0
     */
 
     if ('undefined' === typeof Ember) {
@@ -2353,10 +2351,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.6.0-beta.5'
+      @default '1.6.0'
       @static
     */
-    Ember.VERSION = '1.6.0-beta.5';
+    Ember.VERSION = '1.6.0';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -3183,12 +3181,14 @@ define("ember-metal/events",
 
       ``` javascript
       var Job = Ember.Object.extend({
-        logCompleted: Ember.on('completed', function(){
+        logCompleted: Ember.on('completed', function() {
           console.log('Job completed!');
         })
       });
+
       var job = Job.create();
-      Ember.sendEvent(job, 'completed'); // Logs "Job completed!"
+
+      Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
      ```
 
       @method on
@@ -5095,7 +5095,10 @@ define("ember-metal/mixin",
         moniker: Ember.aliasMethod('name')
       });
 
-      var goodGuy = App.Person.create()
+      var goodGuy = App.Person.create();
+      
+      goodGuy.name();    // 'Tomhuda Katzdale'
+      goodGuy.moniker(); // 'Tomhuda Katzdale'
       ```
 
       @method aliasMethod
@@ -5206,7 +5209,6 @@ define("ember-metal/mixin",
 
       ```javascript
       App.PersonView = Ember.View.extend({
-
         friends: [{ name: 'Tom' }, { name: 'Stefan' }, { name: 'Kris' }],
 
         valueWillChange: Ember.beforeObserver('content.value', function(obj, keyName) {
@@ -6907,7 +6909,7 @@ define("ember-metal/run_loop",
         run.debounce(myContext, myFunc, 150, true);
 
         // console logs 'debounce ran.' one time immediately.
-        // 150ms passes and nothing else is logged tot he console and
+        // 150ms passes and nothing else is logged to the console and
         // the debouncee is no longer being watched
 
       ```
@@ -7004,11 +7006,13 @@ define("ember-metal/set_properties",
       observers will be buffered.
 
       ```javascript
+      var anObject = Ember.Object.create();
+
       anObject.setProperties({
-        firstName: "Stanley",
-        lastName: "Stuart",
-        age: "21"
-      })
+        firstName: 'Stanley',
+        lastName: 'Stuart',
+        age: 21
+      });
       ```
 
       @method setProperties
@@ -7398,9 +7402,9 @@ define("ember-metal/utils",
       not formally array but appears to be array-like (i.e. implements `Ember.Array`)
 
       ```javascript
-      Ember.isArray();                                            // false
-      Ember.isArray([]);                                          // true
-      Ember.isArray( Ember.ArrayProxy.create({ content: [] }) );  // true
+      Ember.isArray();                                          // false
+      Ember.isArray([]);                                        // true
+      Ember.isArray(Ember.ArrayProxy.create({ content: [] }));  // true
       ```
 
       @method isArray
@@ -7435,13 +7439,14 @@ define("ember-metal/utils",
       an array. If obj is `null` or `undefined`, returns an empty array.
 
       ```javascript
-      Ember.makeArray();                           // []
-      Ember.makeArray(null);                       // []
-      Ember.makeArray(undefined);                  // []
-      Ember.makeArray('lindsay');                  // ['lindsay']
-      Ember.makeArray([1,2,42]);                   // [1,2,42]
+      Ember.makeArray();            // []
+      Ember.makeArray(null);        // []
+      Ember.makeArray(undefined);   // []
+      Ember.makeArray('lindsay');   // ['lindsay']
+      Ember.makeArray([1, 2, 42]);  // [1, 2, 42]
 
       var controller = Ember.ArrayProxy.create({ content: [] });
+
       Ember.makeArray(controller) === controller;  // true
       ```
 
@@ -7459,7 +7464,8 @@ define("ember-metal/utils",
       Checks to see if the `methodName` exists on the `obj`.
 
       ```javascript
-      var foo = {bar: Ember.K, baz: null};
+      var foo = { bar: Ember.K, baz: null };
+
       Ember.canInvoke(foo, 'bar'); // true
       Ember.canInvoke(foo, 'baz'); // false
       Ember.canInvoke(foo, 'bat'); // false
@@ -7481,8 +7487,9 @@ define("ember-metal/utils",
 
       ```javascript
       var d = new Date('03/15/2013');
-      Ember.tryInvoke(d, 'getTime'); // 1363320000000
-      Ember.tryInvoke(d, 'setFullYear', [2014]); // 1394856000000
+
+      Ember.tryInvoke(d, 'getTime');              // 1363320000000
+      Ember.tryInvoke(d, 'setFullYear', [2014]);  // 1394856000000
       Ember.tryInvoke(d, 'noSuchMethod', [2014]); // undefined
       ```
 
@@ -7514,7 +7521,7 @@ define("ember-metal/utils",
     })();
 
     /**
-      Provides try { } finally { } functionality, while working
+      Provides try/finally functionality, while working
       around Safari's double finally bug.
 
       ```javascript
@@ -7522,9 +7529,11 @@ define("ember-metal/utils",
         someResource.lock();
         runCallback(); // May throw error.
       };
+
       var finalizer = function() {
         someResource.unlock();
       };
+
       Ember.tryFinally(tryable, finalizer);
       ```
 
@@ -7576,12 +7585,12 @@ define("ember-metal/utils",
     }
 
     /**
-      Provides try { } catch finally { } functionality, while working
+      Provides try/catch/finally functionality, while working
       around Safari's double finally bug.
 
       ```javascript
       var tryable = function() {
-        for (i=0, l=listeners.length; i<l; i++) {
+        for (i = 0, l = listeners.length; i < l; i++) {
           listener = listeners[i];
           beforeValues[i] = listener.before(name, time(), payload);
         }
@@ -7595,11 +7604,12 @@ define("ember-metal/utils",
       };
 
       var finalizer = function() {
-        for (i=0, l=listeners.length; i<l; i++) {
+        for (i = 0, l = listeners.length; i < l; i++) {
           listener = listeners[i];
           listener.after(name, time(), payload, beforeValues[i]);
         }
       };
+
       Ember.tryCatchFinally(tryable, catchable, finalizer);
       ```
 
@@ -7704,15 +7714,15 @@ define("ember-metal/utils",
       Ember.typeOf(true);                   // 'boolean'
       Ember.typeOf(new Boolean(true));      // 'boolean'
       Ember.typeOf(Ember.makeArray);        // 'function'
-      Ember.typeOf([1,2,90]);               // 'array'
+      Ember.typeOf([1, 2, 90]);             // 'array'
       Ember.typeOf(/abc/);                  // 'regexp'
       Ember.typeOf(new Date());             // 'date'
       Ember.typeOf(Ember.Object.extend());  // 'class'
       Ember.typeOf(Ember.Object.create());  // 'instance'
       Ember.typeOf(new Error('teamocil'));  // 'error'
 
-      // "normal" JavaScript object
-      Ember.typeOf({a: 'b'});              // 'object'
+      // 'normal' JavaScript object
+      Ember.typeOf({ a: 'b' });             // 'object'
       ```
 
       @method typeOf
@@ -11243,7 +11253,7 @@ define("container/container",
 
         Optionally the container can be provided with a custom resolver.
         If provided, `resolve` will first provide the custom resolver
-        the oppertunity to resolve the fullName, otherwise it will fallback
+        the opportunity to resolve the fullName, otherwise it will fallback
         to the registry.
 
         ```javascript
@@ -11330,7 +11340,7 @@ define("container/container",
 
         // by default the container will return singletons
         var twitter2 = container.lookup('api:twitter');
-        twitter instanceof Twitter; // => true
+        twitter2 instanceof Twitter; // => true
 
         twitter === twitter2; //=> true
         ```
@@ -12224,7 +12234,7 @@ define("ember-runtime/computed/array_computed",
       The `initialize` function has the following signature:
 
       ```javascript
-       function (array, changeMeta, instanceMeta)
+      function(array, changeMeta, instanceMeta)
       ```
 
       `array` - The initial value of the arrayComputed, an empty array.
@@ -12244,7 +12254,7 @@ define("ember-runtime/computed/array_computed",
       The `removedItem` and `addedItem` functions both have the following signature:
 
       ```javascript
-      function (accumulatedValue, item, changeMeta, instanceMeta)
+      function(accumulatedValue, item, changeMeta, instanceMeta)
       ```
 
       `accumulatedValue` - The value returned from the last time
@@ -12417,8 +12427,12 @@ define("ember-runtime/computed/reduce_computed",
       // because we only have the key; instead we make the observers no-ops
       this.suspended = false;
 
-      // This is used to coalesce item changes from property observers.
+      // This is used to coalesce item changes from property observers within a
+      // single item.
       this.changedItems = {};
+      // This is used to coalesce item changes for multiple items that depend on
+      // some shared state.
+      this.changedItemCount = 0;
     }
 
     function ItemPropertyObserverContext (dependentArray, index, trackedArray) {
@@ -12660,12 +12674,15 @@ define("ember-runtime/computed/reduce_computed",
             previousValues:   {}
           };
         }
+        ++this.changedItemCount;
 
         this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
       },
 
       itemPropertyDidChange: function(obj, keyName, array, observerContext) {
-        this.flushChanges();
+        if (--this.changedItemCount === 0) {
+          this.flushChanges();
+        }
       },
 
       flushChanges: function() {
@@ -13001,7 +13018,7 @@ define("ember-runtime/computed/reduce_computed",
       The `initialize` function has the following signature:
 
       ```javascript
-       function (initialValue, changeMeta, instanceMeta)
+      function(initialValue, changeMeta, instanceMeta)
       ```
 
       `initialValue` - The value of the `initialValue` property from the
@@ -13022,7 +13039,7 @@ define("ember-runtime/computed/reduce_computed",
       The `removedItem` and `addedItem` functions both have the following signature:
 
       ```javascript
-      function (accumulatedValue, item, changeMeta, instanceMeta)
+      function(accumulatedValue, item, changeMeta, instanceMeta)
       ```
 
       `accumulatedValue` - The value returned from the last time
@@ -13072,15 +13089,15 @@ define("ember-runtime/computed/reduce_computed",
       Example
 
       ```javascript
-      Ember.computed.max = function (dependentKey) {
+      Ember.computed.max = function(dependentKey) {
         return Ember.reduceComputed(dependentKey, {
           initialValue: -Infinity,
 
-          addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          addedItem: function(accumulatedValue, item, changeMeta, instanceMeta) {
             return Math.max(accumulatedValue, item);
           },
 
-          removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          removedItem: function(accumulatedValue, item, changeMeta, instanceMeta) {
             if (item < accumulatedValue) {
               return accumulatedValue;
             }
@@ -13114,10 +13131,10 @@ define("ember-runtime/computed/reduce_computed",
       });
 
       App.PersonController = Ember.ObjectController.extend({
-        reversedName: function () {
+        reversedName: function() {
           return reverse(get(this, 'name'));
         }.property('name')
-      })
+      });
       ```
 
       Dependent keys whose values are not arrays are treated as regular
@@ -13248,12 +13265,13 @@ define("ember-runtime/computed/reduce_computed_macros",
       array is empty.
 
       ```javascript
-      App.Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         childAges: Ember.computed.mapBy('children', 'age'),
         maxChildAge: Ember.computed.max('childAges')
       });
 
-      var lordByron = App.Person.create({children: []});
+      var lordByron = Person.create({ children: [] });
+
       lordByron.get('maxChildAge'); // -Infinity
       lordByron.get('children').pushObject({
         name: 'Augusta Ada Byron', age: 7
@@ -13296,12 +13314,13 @@ define("ember-runtime/computed/reduce_computed_macros",
       array is empty.
 
       ```javascript
-      App.Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         childAges: Ember.computed.mapBy('children', 'age'),
         minChildAge: Ember.computed.min('childAges')
       });
 
-      var lordByron = App.Person.create({children: []});
+      var lordByron = Person.create({ children: [] });
+
       lordByron.get('minChildAge'); // Infinity
       lordByron.get('children').pushObject({
         name: 'Augusta Ada Byron', age: 7
@@ -13351,15 +13370,16 @@ define("ember-runtime/computed/reduce_computed_macros",
       Example
 
       ```javascript
-      App.Hamster = Ember.Object.extend({
+      var Hamster = Ember.Object.extend({
         excitingChores: Ember.computed.map('chores', function(chore) {
           return chore.toUpperCase() + '!';
         })
       });
 
-      var hamster = App.Hamster.create({
+      var hamster = Hamster.create({
         chores: ['clean', 'write more unit tests']
       });
+
       hamster.get('excitingChores'); // ['CLEAN!', 'WRITE MORE UNIT TESTS!']
       ```
 
@@ -13389,13 +13409,14 @@ define("ember-runtime/computed/reduce_computed_macros",
       Returns an array mapped to the specified key.
 
       ```javascript
-      App.Person = Ember.Object.extend({
+      var Person = Ember.Object.extend({
         childAges: Ember.computed.mapBy('children', 'age')
       });
 
-      var lordByron = App.Person.create({children: []});
+      var lordByron = Person.create({ children: [] });
+
       lordByron.get('childAges'); // []
-      lordByron.get('children').pushObject({name: 'Augusta Ada Byron', age: 7});
+      lordByron.get('children').pushObject({ name: 'Augusta Ada Byron', age: 7 });
       lordByron.get('childAges'); // [7]
       lordByron.get('children').pushObjects([{
         name: 'Allegra Byron',
@@ -13438,17 +13459,20 @@ define("ember-runtime/computed/reduce_computed_macros",
       ```
 
       ```javascript
-      App.Hamster = Ember.Object.extend({
+      var Hamster = Ember.Object.extend({
         remainingChores: Ember.computed.filter('chores', function(chore) {
           return !chore.done;
         })
       });
 
-      var hamster = App.Hamster.create({chores: [
-        {name: 'cook', done: true},
-        {name: 'clean', done: true},
-        {name: 'write more unit tests', done: false}
-      ]});
+      var hamster = Hamster.create({ 
+        chores: [
+          { name: 'cook', done: true },
+          { name: 'clean', done: true },
+          { name: 'write more unit tests', done: false }
+        ] 
+      });
+
       hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
       ```
 
@@ -13493,16 +13517,19 @@ define("ember-runtime/computed/reduce_computed_macros",
       Filters the array by the property and value
 
       ```javascript
-      App.Hamster = Ember.Object.extend({
+      var Hamster = Ember.Object.extend({
         remainingChores: Ember.computed.filterBy('chores', 'done', false)
       });
 
-      var hamster = App.Hamster.create({chores: [
-        {name: 'cook', done: true},
-        {name: 'clean', done: true},
-        {name: 'write more unit tests', done: false}
-      ]});
-      hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
+      var hamster = Hamster.create({
+        chores: [
+          { name: 'cook', done: true },
+          { name: 'clean', done: true },
+          { name: 'write more unit tests', done: false }
+        ]
+      });
+
+      hamster.get('remainingChores'); // [{ name: 'write more unit tests', done: false }]
       ```
 
       @method computed.filterBy
@@ -13545,16 +13572,19 @@ define("ember-runtime/computed/reduce_computed_macros",
       Example
 
       ```javascript
-      App.Hamster = Ember.Object.extend({
+      var Hamster = Ember.Object.extend({
         uniqueFruits: Ember.computed.uniq('fruits')
       });
 
-      var hamster = App.Hamster.create({fruits: [
-        'banana',
-        'grape',
-        'kale',
-        'banana'
-      ]});
+      var hamster = Hamster.create({
+        fruits: [
+          'banana',
+          'grape',
+          'kale',
+          'banana'
+        ]
+      });
+
       hamster.get('uniqueFruits'); // ['banana', 'grape', 'kale']
       ```
 
@@ -13690,15 +13720,18 @@ define("ember-runtime/computed/reduce_computed_macros",
       Example
 
       ```javascript
-      App.Hamster = Ember.Object.extend({
+      var Hamster = Ember.Object.extend({
         likes: ['banana', 'grape', 'kale'],
         wants: Ember.computed.setDiff('likes', 'fruits')
       });
 
-      var hamster = App.Hamster.create({fruits: [
-        'grape',
-        'kale',
-      ]});
+      var hamster = Hamster.create({
+        fruits: [
+          'grape',
+          'kale',
+        ]
+      });
+
       hamster.get('wants'); // ['banana']
       ```
 
@@ -13830,18 +13863,20 @@ define("ember-runtime/computed/reduce_computed_macros",
           } else if (a.priority < b.priority) {
             return -1;
           }
+
           return 0;
         }),
       });
+
       var todoList = ToDoList.create({todos: [
-        {name: 'Unit Test', priority: 2},
-        {name: 'Documentation', priority: 3},
-        {name: 'Release', priority: 1}
+        { name: 'Unit Test', priority: 2 },
+        { name: 'Documentation', priority: 3 },
+        { name: 'Release', priority: 1 }
       ]});
 
-      todoList.get('sortedTodos'); // [{name:'Documentation', priority:3}, {name:'Release', priority:1}, {name:'Unit Test', priority:2}]
-      todoList.get('sortedTodosDesc'); // [{name:'Unit Test', priority:2}, {name:'Release', priority:1}, {name:'Documentation', priority:3}]
-      todoList.get('priorityTodos'); // [{name:'Release', priority:1}, {name:'Unit Test', priority:2}, {name:'Documentation', priority:3}]
+      todoList.get('sortedTodos');      // [{ name:'Documentation', priority:3 }, { name:'Release', priority:1 }, { name:'Unit Test', priority:2 }]
+      todoList.get('sortedTodosDesc');  // [{ name:'Unit Test', priority:2 }, { name:'Release', priority:1 }, { name:'Documentation', priority:3 }]
+      todoList.get('priorityTodos');    // [{ name:'Release', priority:1 }, { name:'Unit Test', priority:2 }, { name:'Documentation', priority:3 }]
       ```
 
       @method computed.sort
@@ -14444,7 +14479,7 @@ define("ember-runtime/core",
       ```javascript
       Ember.isEqual('hello', 'hello');  // true
       Ember.isEqual(1, 2);              // false
-      Ember.isEqual([4,2], [4,2]);      // false
+      Ember.isEqual([4, 2], [4, 2]);    // false
       ```
 
       @method isEqual
@@ -15815,37 +15850,28 @@ define("ember-runtime/mixins/deferred",
     var run = __dependency5__["default"];
     var RSVP = __dependency6__["default"];
 
-    if (Ember.FEATURES['ember-runtime-test-friendly-promises']) {
-
-      var asyncStart = function() {
-        if (Ember.Test && Ember.Test.adapter) {
-          Ember.Test.adapter.asyncStart();
-        }
-      };
+    var asyncStart = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncStart();
+      }
+    };
 
-      var asyncEnd = function() {
-        if (Ember.Test && Ember.Test.adapter) {
-          Ember.Test.adapter.asyncEnd();
-        }
-      };
+    var asyncEnd = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncEnd();
+      }
+    };
 
-      RSVP.configure('async', function(callback, promise) {
-        var async = !run.currentRunLoop;
+    RSVP.configure('async', function(callback, promise) {
+      var async = !run.currentRunLoop;
 
-        if (Ember.testing && async) { asyncStart(); }
+      if (Ember.testing && async) { asyncStart(); }
 
-        run.backburner.schedule('actions', function(){
-          if (Ember.testing && async) { asyncEnd(); }
-          callback(promise);
-        });
+      run.backburner.schedule('actions', function(){
+        if (Ember.testing && async) { asyncEnd(); }
+        callback(promise);
       });
-    } else {
-      RSVP.configure('async', function(callback, promise) {
-        run.backburner.schedule('actions', function(){
-          callback(promise);
-        });
-      });
-    }
+    });
 
     RSVP.Promise.prototype.fail = function(callback, label){
       Ember.deprecate('RSVP.Promise.fail has been renamed as RSVP.Promise.catch');
@@ -18578,7 +18604,7 @@ define("ember-runtime/mixins/sortable",
         return this._super();
       },
 
-      isSorted: computed.bool('sortProperties'),
+      isSorted: computed.notEmpty('sortProperties'),
 
       /**
         Overrides the default arrangedContent from arrayProxy in order to sort by sortFunction.
@@ -20314,7 +20340,7 @@ define("ember-runtime/system/lazy_load",
       resolved from a string into the object:
 
       ``` javascript
-      Ember.onLoad('Ember.Handlebars' function(hbars){
+      Ember.onLoad('Ember.Handlebars' function(hbars) {
         hbars.registerHelper(...);
       });
       ```
@@ -20729,10 +20755,11 @@ define("ember-runtime/system/native_array",
       var Pagination = Ember.CollectionView.extend({
         tagName: 'ul',
         classNames: ['pagination'],
+
         init: function() {
           this._super();
           if (!this.get('content')) {
-            this.set('content', Ember.A([]));
+            this.set('content', Ember.A());
           }
         }
       });
@@ -22455,7 +22482,7 @@ define("container/container",
 
         Optionally the container can be provided with a custom resolver.
         If provided, `resolve` will first provide the custom resolver
-        the oppertunity to resolve the fullName, otherwise it will fallback
+        the opportunity to resolve the fullName, otherwise it will fallback
         to the registry.
 
         ```javascript
@@ -22542,7 +22569,7 @@ define("container/container",
 
         // by default the container will return singletons
         var twitter2 = container.lookup('api:twitter');
-        twitter instanceof Twitter; // => true
+        twitter2 instanceof Twitter; // => true
 
         twitter === twitter2; //=> true
         ```