ember-source 1.11.0.beta.2.2 → 1.11.0.beta.3

data/dist/ember.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.11.0-beta.2
+ * @version   1.11.0-beta.3.780ac356
  */
 
 (function() {
@@ -7107,7 +7107,7 @@ enifed('ember-htmlbars/helpers/yield', ['exports', 'ember-metal/core', 'ember-me
 
     Ember['default'].assert("You called yield in a template that was not a layout", !!view);
 
-    return view._yield(null, env, options.morph, params);
+    return view._yield(this, env, options.morph, params);
   }
 
 });
@@ -7384,7 +7384,7 @@ enifed('ember-htmlbars/system/append-templated-view', ['exports', 'ember-metal/c
     // no specified controller. See View#_context for more information.
 
     var noControllerInProto = !viewProto.controller;
-    if (viewProto.controller.isDescriptor) { noControllerInProto = true; }
+    if (viewProto.controller && viewProto.controller.isDescriptor) { noControllerInProto = true; }
     if (noControllerInProto &&
         !viewProto.controllerBinding &&
         !props.controller &&
@@ -7762,8 +7762,8 @@ enifed('ember-htmlbars/system/render-view', ['exports', 'ember-metal/core', 'emb
   function renderHTMLBarsTemplate(view, buffer, template) {
     Ember['default'].assert(
       'The template being rendered by `' + view + '` was compiled with `' + template.revision +
-      '` which does not match `Ember@1.11.0-beta.2` (this revision).',
-      template.revision === 'Ember@1.11.0-beta.2'
+      '` which does not match `Ember@1.11.0-beta.3.780ac356` (this revision).',
+      template.revision === 'Ember@1.11.0-beta.3.780ac356'
     );
 
     var contextualElement = buffer.innerContextualElement();
@@ -7803,7 +7803,7 @@ enifed('ember-htmlbars/templates/component', ['exports', 'ember-template-compile
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0-beta.2",
+      revision: "Ember@1.11.0-beta.3.780ac356",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7850,7 +7850,7 @@ enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/sy
   exports['default'] = template['default']((function() {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0-beta.2",
+      revision: "Ember@1.11.0-beta.3.780ac356",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -7891,7 +7891,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     var child0 = (function() {
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0-beta.2",
+        revision: "Ember@1.11.0-beta.3.780ac356",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -7934,7 +7934,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0-beta.2",
+          revision: "Ember@1.11.0-beta.3.780ac356",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -7974,7 +7974,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0-beta.2",
+        revision: "Ember@1.11.0-beta.3.780ac356",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8016,7 +8016,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function() {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.11.0-beta.2",
+          revision: "Ember@1.11.0-beta.3.780ac356",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8056,7 +8056,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       }());
       return {
         isHTMLBars: true,
-        revision: "Ember@1.11.0-beta.2",
+        revision: "Ember@1.11.0-beta.3.780ac356",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8096,7 +8096,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     }());
     return {
       isHTMLBars: true,
-      revision: "Ember@1.11.0-beta.2",
+      revision: "Ember@1.11.0-beta.3.780ac356",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -10406,8 +10406,10 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/property_set', 'ember-me
     }.property('firstName', 'lastName')
     ```
 
-    @method computed
-    @for Ember
+    @class computed
+    @namespace Ember
+    @constructor
+    @static
     @param {String} [dependentKeys*] Optional dependent keys that trigger this computed property.
     @param {Function} func The computed property function.
     @return {Ember.ComputedProperty} property descriptor instance
@@ -10544,8 +10546,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     ```
 
     @since 1.6.0
-    @method computed.empty
-    @for Ember
+    @method empty
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which negate
     the original value for property
@@ -10574,8 +10576,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('hasStuff');         // false
     ```
 
-    @method computed.notEmpty
-    @for Ember
+    @method notEmpty
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which returns true if
     original value for property is not empty.
@@ -10607,8 +10609,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('isHungry'); // true
     ```
 
-    @method computed.none
-    @for Ember
+    @method none
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which
     returns true if original value for property is null or undefined.
@@ -10637,8 +10639,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     user.get('isAnonymous'); // false
     ```
 
-    @method computed.not
-    @for Ember
+    @method not
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which returns
     inverse of the original value for property
@@ -10669,8 +10671,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('hasBananas'); // false
     ```
 
-    @method computed.bool
-    @for Ember
+    @method bool
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which converts
     to boolean the original value for property
@@ -10702,8 +10704,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     user.get('hasValidEmail'); // true
     ```
 
-    @method computed.match
-    @for Ember
+    @method match
+    @for Ember.computed
     @param {String} dependentKey
     @param {RegExp} regexp
     @return {Ember.ComputedProperty} computed property which match
@@ -10737,8 +10739,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('napTime'); // false
     ```
 
-    @method computed.equal
-    @for Ember
+    @method equal
+    @for Ember.computed
     @param {String} dependentKey
     @param {String|Number|Object} value
     @return {Ember.ComputedProperty} computed property which returns true if
@@ -10770,8 +10772,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('hasTooManyBananas'); // true
     ```
 
-    @method computed.gt
-    @for Ember
+    @method gt
+    @for Ember.computed
     @param {String} dependentKey
     @param {Number} value
     @return {Ember.ComputedProperty} computed property which returns true if
@@ -10803,8 +10805,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('hasTooManyBananas'); // true
     ```
 
-    @method computed.gte
-    @for Ember
+    @method gte
+    @for Ember.computed
     @param {String} dependentKey
     @param {Number} value
     @return {Ember.ComputedProperty} computed property which returns true if
@@ -10836,8 +10838,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('needsMoreBananas'); // true
     ```
 
-    @method computed.lt
-    @for Ember
+    @method lt
+    @for Ember.computed
     @param {String} dependentKey
     @param {Number} value
     @return {Ember.ComputedProperty} computed property which returns true if
@@ -10869,8 +10871,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('needsMoreBananas'); // true
     ```
 
-    @method computed.lte
-    @for Ember
+    @method lte
+    @for Ember.computed
     @param {String} dependentKey
     @param {Number} value
     @return {Ember.ComputedProperty} computed property which returns true if
@@ -10904,8 +10906,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('readyForCamp'); // 'Yes'
     ```
 
-    @method computed.and
-    @for Ember
+    @method and
+    @for Ember.computed
     @param {String} dependentKey*
     @return {Ember.ComputedProperty} computed property which performs
     a logical `and` on the values of all the original values for properties.
@@ -10941,8 +10943,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('readyForRain'); // 'Yes'
     ```
 
-    @method computed.or
-    @for Ember
+    @method or
+    @for Ember.computed
     @param {String} dependentKey*
     @return {Ember.ComputedProperty} computed property which performs
     a logical `or` on the values of all the original values for properties.
@@ -10974,8 +10976,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('hasClothes'); // 'Hawaiian Shirt'
     ```
 
-    @method computed.any
-    @for Ember
+    @method any
+    @for Ember.computed
     @param {String} dependentKey*
     @return {Ember.ComputedProperty} computed property which returns
     the first truthy value of given list of properties.
@@ -11009,8 +11011,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('clothes'); // ['Camp Hat', 'Camp Shirt']
     ```
 
-    @method computed.collect
-    @for Ember
+    @method collect
+    @for Ember.computed
     @param {String} dependentKey*
     @return {Ember.ComputedProperty} computed property which maps
     values of all passed in properties to an array.
@@ -11049,8 +11051,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     alex.get('name');  // '@machty'
     ```
 
-    @method computed.alias
-    @for Ember
+    @method alias
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which creates an
     alias to the original value for property.
@@ -11082,8 +11084,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     teddy.get('firstName');             // 'Teddy'
     ```
 
-    @method computed.oneWay
-    @for Ember
+    @method oneWay
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which creates a
     one way computed property to the original value for property.
@@ -11130,8 +11132,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     teddy.get('firstName');             // 'Teddy'
     ```
 
-    @method computed.readOnly
-    @for Ember
+    @method readOnly
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which creates a
     one way computed property to the original value for property.
@@ -11161,8 +11163,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     hamster.get('favoriteFood');                 // 'Banana'
     ```
 
-    @method computed.defaultTo
-    @for Ember
+    @method defaultTo
+    @for Ember.computed
     @param {String} defaultPath
     @return {Ember.ComputedProperty} computed property which acts like
     a standard getter and setter, but defaults to the value from `defaultPath`.
@@ -11185,8 +11187,8 @@ enifed('ember-metal/computed_macros', ['exports', 'ember-metal/core', 'ember-met
     though they were called on the original property, but also
     print a deprecation warning.
 
-    @method computed.deprecatingAlias
-    @for Ember
+    @method deprecatingAlias
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computed property which creates an
     alias with a deprecation to the original value for property.
@@ -11241,7 +11243,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.11.0-beta.2
+    @version 1.11.0-beta.3.780ac356
   */
 
   if ('undefined' === typeof Ember) {
@@ -11269,10 +11271,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   /**
     @property VERSION
     @type String
-    @default '1.11.0-beta.2'
+    @default '1.11.0-beta.3.780ac356'
     @static
   */
-  Ember.VERSION = '1.11.0-beta.2';
+  Ember.VERSION = '1.11.0-beta.3.780ac356';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -18521,7 +18523,7 @@ enifed('ember-routing-htmlbars/helpers/link-to', ['exports', 'ember-metal/core',
 
       options.template = {
         isHTMLBars: true,
-        revision: 'Ember@1.11.0-beta.2',
+        revision: 'Ember@1.11.0-beta.3.780ac356',
         render: function(view, env) {
           var value = utils.read(linkTitle) || "";
           if (parseTextAsHTML) {
@@ -23777,8 +23779,14 @@ enifed('ember-routing/system/router', ['exports', 'ember-metal/core', 'ember-met
     }
   };
 
-  function logError(error, initialMessage) {
+  function logError(_error, initialMessage) {
     var errorArgs = [];
+    var error;
+    if (_error && typeof _error === 'object' && typeof _error.errorThrown === 'object') {
+      error = _error.errorThrown;
+    } else {
+      error = _error;
+    }
 
     if (initialMessage) { errorArgs.push(initialMessage); }
 
@@ -25440,8 +25448,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
    A computed property that returns the sum of the value
    in the dependent array.
 
-   @method computed.sum
-   @for Ember
+   @method sum
+   @for Ember.computed
    @param {String} dependentKey
    @return {Ember.ComputedProperty} computes the sum of all values in the dependentKey's array
    @since 1.4.0
@@ -25489,8 +25497,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     lordByron.get('maxChildAge'); // 8
     ```
 
-    @method computed.max
-    @for Ember
+    @method max
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
   */
@@ -25538,8 +25546,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     lordByron.get('minChildAge'); // 5
     ```
 
-    @method computed.min
-    @for Ember
+    @method min
+    @for Ember.computed
     @param {String} dependentKey
     @return {Ember.ComputedProperty} computes the smallest value in the dependentKey's array
   */
@@ -25586,8 +25594,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     hamster.get('excitingChores'); // ['CLEAN!', 'WRITE MORE UNIT TESTS!']
     ```
 
-    @method computed.map
-    @for Ember
+    @method map
+    @for Ember.computed
     @param {String} dependentKey
     @param {Function} callback
     @return {Ember.ComputedProperty} an array mapped via the callback
@@ -25631,8 +25639,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     lordByron.get('childAges'); // [7, 5, 8]
     ```
 
-    @method computed.mapBy
-    @for Ember
+    @method mapBy
+    @for Ember.computed
     @param {String} dependentKey
     @param {String} propertyKey
     @return {Ember.ComputedProperty} an array mapped to the specified key
@@ -25643,8 +25651,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
   }
 
   /**
-    @method computed.mapProperty
-    @for Ember
+    @method mapProperty
+    @for Ember.computed
     @deprecated Use `Ember.computed.mapBy` instead
     @param dependentKey
     @param propertyKey
@@ -25681,8 +25689,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
     ```
 
-    @method computed.filter
-    @for Ember
+    @method filter
+    @for Ember.computed
     @param {String} dependentKey
     @param {Function} callback
     @return {Ember.ComputedProperty} the filtered array
@@ -25737,8 +25745,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     hamster.get('remainingChores'); // [{ name: 'write more unit tests', done: false }]
     ```
 
-    @method computed.filterBy
-    @for Ember
+    @method filterBy
+    @for Ember.computed
     @param {String} dependentKey
     @param {String} propertyKey
     @param {*} value
@@ -25761,8 +25769,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
   }
 
   /**
-    @method computed.filterProperty
-    @for Ember
+    @method filterProperty
+    @for Ember.computed
     @param dependentKey
     @param propertyKey
     @param value
@@ -25793,8 +25801,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     hamster.get('uniqueFruits'); // ['banana', 'grape', 'kale']
     ```
 
-    @method computed.uniq
-    @for Ember
+    @method uniq
+    @for Ember.computed
     @param {String} propertyKey*
     @return {Ember.ComputedProperty} computes a new array with all the
     unique elements from the dependent array
@@ -25837,8 +25845,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
   /**
     Alias for [Ember.computed.uniq](/api/#method_computed_uniq).
 
-    @method computed.union
-    @for Ember
+    @method union
+    @for Ember.computed
     @param {String} propertyKey*
     @return {Ember.ComputedProperty} computes a new array with all the
     unique elements from the dependent array
@@ -25861,8 +25869,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     obj.get('friendsInCommon'); // ['William King', 'Mary Somerville']
     ```
 
-    @method computed.intersect
-    @for Ember
+    @method intersect
+    @for Ember.computed
     @param {String} propertyKey*
     @return {Ember.ComputedProperty} computes a new array with all the
     duplicated elements from the dependent arrays
@@ -25948,8 +25956,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     hamster.get('wants'); // ['banana']
     ```
 
-    @method computed.setDiff
-    @for Ember
+    @method setDiff
+    @for Ember.computed
     @param {String} setAProperty
     @param {String} setBProperty
     @return {Ember.ComputedProperty} computes a new array with all the
@@ -26092,8 +26100,8 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     todoList.get('priorityTodos');    // [{ name:'Release', priority:1 }, { name:'Unit Test', priority:2 }, { name:'Documentation', priority:3 }]
     ```
 
-    @method computed.sort
-    @for Ember
+    @method sort
+    @for Ember.computed
     @param {String} dependentKey
     @param {String or Function} sortDefinition a dependent key to an
     array of sort properties (add `:desc` to the arrays sort properties to sort descending) or a function to use when sorting
@@ -34402,7 +34410,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
     var disableComponentGeneration = true;
     
     return {
-      revision: 'Ember@1.11.0-beta.2',
+      revision: 'Ember@1.11.0-beta.3.780ac356',
 
       disableComponentGeneration: disableComponentGeneration,
 
@@ -34938,8 +34946,8 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   Example:
 
   ```javascript
-  function validateRouteName(){
-  equal(currentRouteName(), 'some.path', "correct route was transitioned into.");
+  function validateRouteName() {
+    equal(currentRouteName(), 'some.path', "correct route was transitioned into.");
   }
 
   visit('/some/path').then(validateRouteName)
@@ -34957,8 +34965,8 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   Example:
 
   ```javascript
-  function validateURL(){
-  equal(currentPath(), 'some.path.index', "correct path was transitioned into.");
+  function validateURL() {
+    equal(currentPath(), 'some.path.index', "correct path was transitioned into.");
   }
 
   click('#some-link-id').then(validateURL);
@@ -34976,8 +34984,8 @@ enifed('ember-testing/helpers', ['ember-metal/core', 'ember-metal/property_get',
   Example:
 
   ```javascript
-  function validateURL(){
-  equal(currentURL(), '/some/path', "correct URL was transitioned into.");
+  function validateURL() {
+    equal(currentURL(), '/some/path', "correct URL was transitioned into.");
   }
 
   click('#some-link-id').then(validateURL);
@@ -35789,6 +35797,11 @@ enifed('ember-views/attr_nodes/attr_node', ['exports', 'ember-metal/streams/util
       value = '';
     }
 
+    // If user is typing in a value we don't want to rerender and loose cursor position.
+    if (this.attrName === 'value' && this._morph.element.value === value) {
+      return;
+    }
+
     if (this.lastValue !== null || value !== null) {
       this._morph.setContent(value);
       this.lastValue = value;
@@ -39271,6 +39284,13 @@ enifed('ember-views/views/component', ['exports', 'ember-metal/core', 'ember-vie
     @extends Ember.View
   */
   var Component = View['default'].extend(TargetActionSupport['default'], ComponentTemplateDeprecation['default'], {
+    /*
+      This is set so that the proto inspection in appendTemplatedView does not
+      think that it should set the components `context` to that of the parent view.
+    */
+    controller: null,
+    context: null,
+
     instrumentName: 'component',
     instrumentDisplay: computed.computed(function() {
       if (this._debugContainerKey) {
@@ -40165,7 +40185,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
 
   var selectOptionDefaultTemplate = {
     isHTMLBars: true,
-    revision: 'Ember@1.11.0-beta.2',
+    revision: 'Ember@1.11.0-beta.3.780ac356',
     render: function(context, env, contextualElement) {
       var lazyValue = context.getStream('view.label');
 
@@ -42077,7 +42097,7 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/
 
       if (template) {
         if (template.isHTMLBars) {
-          return template.render(this, options, morph.contextualElement);
+          return template.render(context, options, morph.contextualElement);
         } else {
           return template(context, options);
         }