dist/ember.js in ember-source-2.2.0 vs dist/ember.js in ember-source-2.2.1

- old
+ new

@@ -4,11 +4,11 @@ * @copyright Copyright 2011-2015 Tilde Inc. and contributors * Portions Copyright 2006-2011 Strobe Inc. * 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.2.0 + * @version 2.2.1 */ var enifed, requireModule, require, requirejs, Ember; var mainContext = this; @@ -9736,11 +9736,11 @@ @submodule ember-templates */ 'use strict'; - _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.2.0'; + _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.2.1'; /** The `{{outlet}}` helper lets you specify where a child routes will render in your template. An important use of the `{{outlet}}` helper is in your application's `application.hbs` file: @@ -15425,11 +15425,11 @@ cross-platform libraries such as jQuery. For more details, see [Ember-Runtime](http://emberjs.com/api/modules/ember-runtime.html). @class Ember @static - @version 2.2.0 + @version 2.2.1 @public */ 'use strict'; @@ -15469,15 +15469,15 @@ /** The semantic version. @property VERSION @type String - @default '2.2.0' + @default '2.2.1' @static @public */ - Ember.VERSION = '2.2.0'; + Ember.VERSION = '2.2.1'; /** The hash of environment variables used to control various configuration settings. To specify your own or override default settings, add the desired properties to a global hash named `EmberENV` (or `ENV` for @@ -29123,11 +29123,11 @@ @submodule ember-routing-views */ 'use strict'; - _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.2.0'; + _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.2.1'; /** `Ember.LinkComponent` renders an element whose `click` event triggers a transition of the application's instance of `Ember.Router` to a supplied route by name. @@ -29613,11 +29613,11 @@ @submodule ember-routing-views */ 'use strict'; - _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.2.0'; + _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.2.1'; var CoreOutletView = _emberViewsViewsView.default.extend({ defaultTemplate: _emberHtmlbarsTemplatesTopLevelView.default, init: function () { @@ -38448,11 +38448,11 @@ options.plugins = plugins; options.buildMeta = function buildMeta(program) { return { fragmentReason: fragmentReason(program), - revision: 'Ember@2.2.0', + revision: 'Ember@2.2.1', loc: program.loc, moduleName: options.moduleName }; }; @@ -43778,11 +43778,11 @@ exports.DeprecatedCollectionView = DeprecatedCollectionView; }); enifed('ember-views/views/container_view', ['exports', 'ember-metal/core', 'ember-metal/debug', 'ember-runtime/mixins/mutable_array', 'ember-runtime/system/native_array', 'ember-views/views/view', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/mixin', 'ember-metal/events', 'ember-htmlbars/templates/container-view'], function (exports, _emberMetalCore, _emberMetalDebug, _emberRuntimeMixinsMutable_array, _emberRuntimeSystemNative_array, _emberViewsViewsView, _emberMetalProperty_get, _emberMetalProperty_set, _emberMetalMixin, _emberMetalEvents, _emberHtmlbarsTemplatesContainerView) { 'use strict'; - _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.2.0'; + _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.2.1'; /** @module ember @submodule ember-views */ @@ -49117,11 +49117,11 @@ case 'object': if (typeof content.nodeType === 'number') { return this.setNode(content); } /* Handlebars.SafeString */ - if (typeof content.string === 'string') { - return this.setHTML(content.string); + if (typeof content.toHTML === 'function') { + return this.setHTML(content.toHTML()); } if (this.parseTextAsHTML) { return this.setHTML(content.toString()); } /* falls through */