ember-source 2.12.0.beta.2 → 2.12.0.beta.3

data/dist/ember-tests.prod.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.12.0-beta.2
+ * @version   2.12.0-beta.3
  */
 
 var enifed, requireModule, Ember;
@@ -164,7 +164,7 @@ function defaults(obj, defaults) {
   return obj;
 }
 
-babelHelpers = {
+var babelHelpers = {
   inherits: inherits,
   taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
   slice: Array.prototype.slice,
@@ -7721,6 +7721,14 @@ enifed('ember-extension-support/tests/data_adapter_test', ['exports', 'ember-met
     _emberMetal.set(post, 'title', 'New Title');
     equal(updatesCalled, 1, 'Release function removes observers');
   });
+
+  QUnit.test('_nameToClass does not error when not found', function (assert) {
+    adapter = App.__container__.lookup('data-adapter:main');
+
+    var klass = adapter._nameToClass('App.Foo');
+
+    assert.equal(klass, undefined, 'returns undefined');
+  });
 });
 enifed('ember-extension-support/tests/data_adapter_test.lint-test', ['exports'], function (exports) {
   'use strict';
@@ -16562,6 +16570,48 @@ enifed('ember-glimmer/tests/integration/components/curly-components-test.lint-te
     assert.ok(true, 'ember-glimmer/tests/integration/components/curly-components-test.js should pass ESLint\n\n');
   });
 });
+enifed('ember-glimmer/tests/integration/components/destroy-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsTestCase) {
+  'use strict';
+
+  _emberGlimmerTestsUtilsTestCase.moduleFor('Component destroy', (function (_RenderingTest) {
+    babelHelpers.inherits(_class, _RenderingTest);
+
+    function _class() {
+      _RenderingTest.apply(this, arguments);
+    }
+
+    _class.prototype['@test it correctly releases the destroyed components'] = function testItCorrectlyReleasesTheDestroyedComponents(assert) {
+      var _this = this;
+
+      var FooBarComponent = _emberGlimmerTestsUtilsHelpers.Component.extend({});
+
+      this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
+
+      this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
+
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+
+      this.runTask(function () {
+        return _emberMetal.set(_this.context, 'switch', false);
+      });
+
+      this.assertText('');
+
+      assert.equal(this.env.destroyedComponents.length, 0, 'enviroment.destroyedComponents should be empty');
+    };
+
+    return _class;
+  })(_emberGlimmerTestsUtilsTestCase.RenderingTest));
+});
+enifed('ember-glimmer/tests/integration/components/destroy-test.lint-test', ['exports'], function (exports) {
+  'use strict';
+
+  QUnit.module('ESLint | ember-glimmer/tests/integration/components/destroy-test.js');
+  QUnit.test('should pass ESLint', function (assert) {
+    assert.expect(1);
+    assert.ok(true, 'ember-glimmer/tests/integration/components/destroy-test.js should pass ESLint\n\n');
+  });
+});
 enifed('ember-glimmer/tests/integration/components/dynamic-components-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/abstract-test-case', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsAbstractTestCase, _emberGlimmerTestsUtilsTestCase) {
   'use strict';
 
@@ -22285,8 +22335,8 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       _emberMetal.setDebugFunction('warn', originalWarn);
     };
 
-    StyleTest.prototype.assertStyleWarning = function assertStyleWarning() {
-      this.assert.deepEqual(warnings, [_emberViews.STYLE_WARNING]);
+    StyleTest.prototype.assertStyleWarning = function assertStyleWarning(style) {
+      this.assert.deepEqual(warnings, [_emberViews.constructStyleDeprecationMessage(style)]);
     };
 
     StyleTest.prototype.assertNoWarning = function assertNoWarning() {
@@ -22381,11 +22431,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       }
 
       _class9.prototype['@test specifying <div style={{userValue}}></div> generates a warning'] = function testSpecifyingDivStyleUserValueDivGeneratesAWarning(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style={{userValue}}></div>', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test specifying `attributeBindings: ["style"]` generates a warning'] = function testSpecifyingAttributeBindingsStyleGeneratesAWarning(assert) {
@@ -22394,12 +22445,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
         });
 
         this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
-
+        var userValue = 'width: 42px';
         this.render('{{foo-bar style=userValue}}', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test specifying `<div style={{{userValue}}}></div>` works properly without a warning'] = function testSpecifyingDivStyleUserValueDivWorksProperlyWithoutAWarning(assert) {
@@ -22449,35 +22500,39 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       };
 
       _class9.prototype['@test binding warning is triggered when an unsafe string is quoted'] = function testBindingWarningIsTriggeredWhenAnUnsafeStringIsQuoted(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style="{{userValue}}"></div>', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a complete property is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForACompletePropertyIsConcatenatedInPlace(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style="color: green; {{userValue}}"></div>', {
           userValue: new _emberGlimmerTestsUtilsHelpers.SafeString('width: 42px')
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; ' + userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a value is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAValueIsConcatenatedInPlace(assert) {
+        var userValue = '42px';
         this.render('<div style="color: green; width: {{userValue}}"></div>', {
-          userValue: new _emberGlimmerTestsUtilsHelpers.SafeString('42px')
+          userValue: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; width: ' + userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a property name is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAPropertyNameIsConcatenatedInPlace(assert) {
+        var userValue = 'width';
         this.render('<div style="color: green; {{userProperty}}: 42px"></div>', {
-          userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString('width')
+          userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; ' + userValue + ': 42px');
       };
 
       return _class9;
@@ -45285,7 +45340,7 @@ enifed('ember-metal/tests/run_loop/once_test.lint-test', ['exports'], function (
     assert.ok(true, 'ember-metal/tests/run_loop/once_test.js should pass ESLint\n\n');
   });
 });
-enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler'], function (exports, _emberMetalRun_loop, _emberMetalError_handler) {
+enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler', 'ember-metal/testing'], function (exports, _emberMetalRun_loop, _emberMetalError_handler, _emberMetalTesting) {
   'use strict';
 
   QUnit.module('system/run_loop/onerror_test');
@@ -45312,17 +45367,24 @@ enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_l
   QUnit.test('With Ember.onerror set, errors in Ember.run are caught', function () {
     var thrown = new Error('Boom!');
     var original = _emberMetalError_handler.getOnerror();
+    var originalDispatchOverride = _emberMetalError_handler.getDispatchOverride();
+    var originalIsTesting = _emberMetalTesting.isTesting();
 
     var caught = undefined;
     _emberMetalError_handler.setOnerror(function (error) {
       caught = error;
     });
+    _emberMetalError_handler.setDispatchOverride(null);
+    _emberMetalTesting.setTesting(false);
+
     try {
       _emberMetalRun_loop.default(function () {
         throw thrown;
       });
     } finally {
       _emberMetalError_handler.setOnerror(original);
+      _emberMetalError_handler.setDispatchOverride(originalDispatchOverride);
+      _emberMetalTesting.setTesting(originalIsTesting);
     }
 
     deepEqual(caught, thrown);
@@ -64805,9 +64867,11 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
       originalQUnit = window.QUnit;
     },
     teardown: function () {
-      _emberMetal.run(App, App.destroy);
-      App.removeTestHelpers();
-      App = null;
+      if (App) {
+        _emberMetal.run(App, App.destroy);
+        App.removeTestHelpers();
+        App = null;
+      }
 
       _emberTestingTest.default.adapter = originalAdapter;
       window.QUnit = originalQUnit;
@@ -64861,6 +64925,23 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
     ok(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersAdapter.default);
     ok(!(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersQunit.default));
   });
+
+  QUnit.test('With Ember.Test.adapter set, errors in Ember.run are caught', function () {
+    var thrown = new Error('Boom!');
+
+    var caught = undefined;
+    _emberTestingTest.default.adapter = _emberTestingAdaptersQunit.default.create({
+      exception: function (error) {
+        caught = error;
+      }
+    });
+
+    _emberMetal.run(function () {
+      throw thrown;
+    });
+
+    deepEqual(caught, thrown);
+  });
 });
 enifed('ember-testing/tests/adapters_test.lint-test', ['exports'], function (exports) {
   'use strict';

data/dist/ember.debug.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.12.0-beta.2
+ * @version   2.12.0-beta.3
  */
 
 var enifed, requireModule, Ember;
@@ -174,7 +174,7 @@ function defaults(obj, defaults) {
   return obj;
 }
 
-babelHelpers = {
+var babelHelpers = {
   classCallCheck: classCallCheck,
   inherits: inherits,
   taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
@@ -6732,7 +6732,8 @@ enifed('ember-extension-support/data_adapter', ['exports', 'ember-utils', 'ember
     _nameToClass: function (type) {
       if (typeof type === 'string') {
         var owner = _emberUtils.getOwner(this);
-        type = owner[_container.FACTORY_FOR]('model:' + type).class;
+        var Factory = owner[_container.FACTORY_FOR]('model:' + type);
+        type = Factory && Factory.class;
       }
       return type;
     },
@@ -9186,7 +9187,7 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
       this.isInteractive = owner.lookup('-environment:main').isInteractive;
 
       // can be removed once https://github.com/tildeio/glimmer/pull/305 lands
-      this.destroyedComponents = undefined;
+      this.destroyedComponents = [];
 
       _emberGlimmerProtocolForUrl.default(this);
 
@@ -9574,16 +9575,16 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
       this.inTransaction = true;
 
       _GlimmerEnvironment.prototype.begin.call(this);
-
-      this.destroyedComponents = [];
     };
 
     Environment.prototype.commit = function commit() {
+      var destroyedComponents = this.destroyedComponents;
+      this.destroyedComponents = [];
       // components queued for destruction must be destroyed before firing
       // `didCreate` to prevent errors when removing and adding a component
       // with the same name (would throw an error when added to view registry)
-      for (var i = 0; i < this.destroyedComponents.length; i++) {
-        this.destroyedComponents[i].destroy();
+      for (var i = 0; i < destroyedComponents.length; i++) {
+        destroyedComponents[i].destroy();
       }
 
       _GlimmerEnvironment.prototype.commit.call(this);
@@ -9609,7 +9610,7 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
       StyleAttributeManager.prototype.setAttribute = function setAttribute(dom, element, value) {
         var _AttributeManager$prototype$setAttribute;
 
-        _emberMetal.warn(_emberViews.STYLE_WARNING, (function () {
+        _emberMetal.warn(_emberViews.constructStyleDeprecationMessage(value), (function () {
           if (value === null || value === undefined || _glimmerRuntime.isSafeString(value)) {
             return true;
           }
@@ -9621,7 +9622,7 @@ enifed('ember-glimmer/environment', ['exports', 'ember-utils', 'ember-metal', 'e
       StyleAttributeManager.prototype.updateAttribute = function updateAttribute(dom, element, value) {
         var _AttributeManager$prototype$updateAttribute;
 
-        _emberMetal.warn(_emberViews.STYLE_WARNING, (function () {
+        _emberMetal.warn(_emberViews.constructStyleDeprecationMessage(value), (function () {
           if (value === null || value === undefined || _glimmerRuntime.isSafeString(value)) {
             return true;
           }
@@ -10350,7 +10351,7 @@ enifed('ember-glimmer/helpers/component', ['exports', 'ember-utils', 'ember-glim
     )}}
     ```
   
-    When yielding the component via the `hash` helper, the component is invocked directly.
+    When yielding the component via the `hash` helper, the component is invoked directly.
     See the following snippet:
   
     ```
@@ -17934,6 +17935,7 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
   exports.getOnerror = getOnerror;
   exports.setOnerror = setOnerror;
   exports.dispatchError = dispatchError;
+  exports.getDispatchOverride = getDispatchOverride;
   exports.setDispatchOverride = setDispatchOverride;
 
   // To maintain stacktrace consistency across browsers
@@ -17974,6 +17976,10 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
 
   // allows testing adapter to override dispatch
 
+  function getDispatchOverride() {
+    return dispatchOverride;
+  }
+
   function setDispatchOverride(handler) {
     dispatchOverride = handler;
   }
@@ -22606,7 +22612,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-utils', 'ember-metal/debug', '
 
   var onErrorTarget = {
     get onerror() {
-      return _emberMetalError_handler.getOnerror();
+      return _emberMetalError_handler.dispatchError;
     },
     set onerror(handler) {
       return _emberMetalError_handler.setOnerror(handler);
@@ -35263,9 +35269,9 @@ enifed('ember-runtime/mixins/observable', ['exports', 'ember-metal'], function (
       only a sender and key value as parameters or, if you aren't interested in
       any of these values, to write an observer that has no parameters at all.
        @method addObserver
-      @param {String} key The key to observer
+      @param {String} key The key to observe
       @param {Object} target The target object to invoke
-      @param {String|Function} method The method to invoke.
+      @param {String|Function} method The method to invoke
       @public
     */
     addObserver: function (key, target, method) {
@@ -35277,9 +35283,9 @@ enifed('ember-runtime/mixins/observable', ['exports', 'ember-metal'], function (
       the same key, target, and method you passed to `addObserver()` and your
       target will no longer receive notifications.
        @method removeObserver
-      @param {String} key The key to observer
+      @param {String} key The key to observe
       @param {Object} target The target object to invoke
-      @param {String|Function} method The method to invoke.
+      @param {String|Function} method The method to invoke
       @public
     */
     removeObserver: function (key, target, method) {
@@ -40727,8 +40733,7 @@ enifed('ember-utils/owner', ['exports', 'ember-utils/symbol'], function (exports
     For example, this component dynamically looks up a service based on the
     `audioType` passed as an attribute:
   
-    ```
-    // app/components/play-audio.js
+    ```app/components/play-audio.js
     import Ember from 'ember';
   
     // Usage:
@@ -40952,7 +40957,7 @@ enifed('ember-views/index', ['exports', 'ember-views/system/ext', 'ember-views/s
   exports.getViewId = _emberViewsSystemUtils.getViewId;
   exports.getViewElement = _emberViewsSystemUtils.getViewElement;
   exports.setViewElement = _emberViewsSystemUtils.setViewElement;
-  exports.STYLE_WARNING = _emberViewsSystemUtils.STYLE_WARNING;
+  exports.constructStyleDeprecationMessage = _emberViewsSystemUtils.constructStyleDeprecationMessage;
   exports.EventDispatcher = _emberViewsSystemEvent_dispatcher.default;
   exports.ComponentLookup = _emberViewsComponent_lookup.default;
   exports.TextSupport = _emberViewsMixinsText_support.default;
@@ -42275,9 +42280,11 @@ enifed('ember-views/system/event_dispatcher', ['exports', 'ember-utils', 'ember-
         throw new TypeError('Unable to add \'' + ROOT_ELEMENT_CLASS + '\' class to root element (' + (rootElement.selector || rootElement[0].tagName) + '). Make sure you set rootElement to the body or an element in the body.');
       }
 
+      var viewRegistry = this._getViewRegistry();
+
       for (event in events) {
         if (events.hasOwnProperty(event)) {
-          this.setupHandler(rootElement, event, events[event]);
+          this.setupHandler(rootElement, event, events[event], viewRegistry);
         }
       }
     },
@@ -42293,13 +42300,11 @@ enifed('ember-views/system/event_dispatcher', ['exports', 'ember-utils', 'ember-
       @param {Element} rootElement
       @param {String} event the browser-originated event to listen to
       @param {String} eventName the name of the method to call on the view
+      @param {Object} viewRegistry
     */
-    setupHandler: function (rootElement, event, eventName) {
+    setupHandler: function (rootElement, event, eventName, viewRegistry) {
       var self = this;
 
-      var owner = _emberUtils.getOwner(this);
-      var viewRegistry = owner && owner.lookup('-view-registry:main') || _emberViewsCompatFallbackViewRegistry.default;
-
       if (eventName === null) {
         return;
       }
@@ -42340,6 +42345,13 @@ enifed('ember-views/system/event_dispatcher', ['exports', 'ember-utils', 'ember-
       });
     },
 
+    _getViewRegistry: function () {
+      var owner = _emberUtils.getOwner(this);
+      var viewRegistry = owner && owner.lookup('-view-registry:main') || _emberViewsCompatFallbackViewRegistry.default;
+
+      return viewRegistry;
+    },
+
     _findNearestEventManager: function (view, eventName) {
       var manager = null;
 
@@ -42476,6 +42488,7 @@ enifed('ember-views/system/utils', ['exports', 'ember-utils'], function (exports
   'use strict';
 
   exports.isSimpleClick = isSimpleClick;
+  exports.constructStyleDeprecationMessage = constructStyleDeprecationMessage;
   exports.getRootViews = getRootViews;
   exports.getViewId = getViewId;
   exports.getViewElement = getViewElement;
@@ -42503,9 +42516,10 @@ enifed('ember-views/system/utils', ['exports', 'ember-utils'], function (exports
     return !modifier && !secondaryClick;
   }
 
-  var STYLE_WARNING = '' + 'Binding style attributes may introduce cross-site scripting vulnerabilities; ' + 'please ensure that values being bound are properly escaped. For more information, ' + 'including how to disable this warning, see ' + 'http://emberjs.com/deprecations/v1.x/#toc_binding-style-attributes.';
+  function constructStyleDeprecationMessage(affectedStyle) {
+    return '' + 'Binding style attributes may introduce cross-site scripting vulnerabilities; ' + 'please ensure that values being bound are properly escaped. For more information, ' + 'including how to disable this warning, see ' + 'http://emberjs.com/deprecations/v1.x/#toc_binding-style-attributes. ' + 'Style affected: "' + affectedStyle + '"';
+  }
 
-  exports.STYLE_WARNING = STYLE_WARNING;
   /**
     @private
     @method getRootViews
@@ -43525,7 +43539,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.12.0-beta.2";
+  exports.default = "2.12.0-beta.3";
 });
 enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
   'use strict';
@@ -58911,6 +58925,7 @@ enifed('rsvp', ['exports'], function (exports) {
     } else {
       if (then$$ === GET_THEN_ERROR) {
         reject(promise, GET_THEN_ERROR.error);
+        GET_THEN_ERROR.error = null;
       } else if (then$$ === undefined) {
         fulfill(promise, maybeThenable);
       } else if (isFunction(then$$)) {
@@ -59038,10 +59053,10 @@ enifed('rsvp', ['exports'], function (exports) {
       if (value === TRY_CATCH_ERROR) {
         failed = true;
         error = value.error;
-        value = null;
+        value.error = null; // release
       } else {
-        succeeded = true;
-      }
+          succeeded = true;
+        }
 
       if (promise === value) {
         reject(promise, withOwnPromise());
@@ -59825,7 +59840,7 @@ enifed('rsvp', ['exports'], function (exports) {
       try {
         return findAuthor(); // succeed or fail
       } catch(error) {
-        return findOtherAuther();
+        return findOtherAuthor();
       } finally {
         // always runs
         // doesn't affect the return value
@@ -59836,7 +59851,7 @@ enifed('rsvp', ['exports'], function (exports) {
     
       ```js
       findAuthor().catch(function(reason){
-        return findOtherAuther();
+        return findOtherAuthor();
       }).finally(function(){
         // author was either found, or not
       });