dist/ember.prod.js in ember-source-2.1.0 vs dist/ember.prod.js in ember-source-2.1.2
- old
+ new
@@ -3,11 +3,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.1.0
+ * @version 2.1.2
*/
(function() {
var enifed, requireModule, eriuqer, requirejs, Ember;
var mainContext = this;
@@ -6251,13 +6251,13 @@
}
function bindKeyword(self, keyword, item) {
var _ref;
- return (_ref = {
+ return _ref = {
self: self
- }, _ref[keyword] = item, _ref);
+ }, _ref[keyword] = item, _ref;
}
var deprecation = 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each items as |item|}}`) instead.';
exports.deprecation = deprecation;
});
@@ -8439,11 +8439,11 @@
@submodule ember-templates
*/
'use strict';
- _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.1.0';
+ _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.1.2';
/**
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:
@@ -9489,19 +9489,28 @@
}
function processNamedPositionalParameters(renderNode, positionalParams, params, attrs) {
var paramsStartIndex = renderNode.state.isComponentHelper ? 1 : 0;
- for (var i = 0; i < positionalParams.length; i++) {
+ var limit = Math.min(params.length, positionalParams.length);
+
+ for (var i = 0; i < limit; i++) {
var param = params[paramsStartIndex + i];
attrs[positionalParams[i]] = param;
}
}
function processRestPositionalParameters(renderNode, positionalParamsName, params, attrs) {
+ var nameInAttrs = (positionalParamsName in attrs);
+
+ // when no params are used, do not override the specified `attrs.stringParamName` value
+ if (params.length === 0 && nameInAttrs) {
+ return;
+ }
+
// If there is already an attribute for that variable, do nothing
var paramsStartIndex = renderNode.state.isComponentHelper ? 1 : 0;
var paramsStream = new _emberMetalStreamsStream.default(function () {
@@ -11369,14 +11378,12 @@
@return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
@public
*/
function htmlSafe(str) {
if (str === null || str === undefined) {
- return '';
- }
-
- if (typeof str !== 'string') {
+ str = '';
+ } else if (typeof str !== 'string') {
str = '' + str;
}
return new _htmlbarsUtil.SafeString(str);
}
@@ -14344,11 +14351,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.1.0
+ @version 2.1.2
@public
*/
'use strict';
@@ -14378,15 +14385,15 @@
/**
The semantic version.
@property VERSION
@type String
- @default '2.1.0'
+ @default '2.1.2'
@static
@public
*/
- Ember.VERSION = '2.1.0';
+ Ember.VERSION = '2.1.2';
/**
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
@@ -14663,20 +14670,22 @@
if (hasDOM) {
environment = {
hasDOM: true,
isChrome: !!window.chrome && !window.opera,
isFirefox: typeof InstallTrigger !== 'undefined',
+ isPhantom: !!window.callPhantom,
location: window.location,
history: window.history,
userAgent: window.navigator.userAgent,
global: window
};
} else {
environment = {
hasDOM: false,
isChrome: false,
isFirefox: false,
+ isPhantom: false,
location: null,
history: null,
userAgent: 'Lynx (textmode)',
global: null
};
@@ -20859,11 +20868,11 @@
var HAS_SUPER_PATTERN = /\.(_super|call\(this|apply\(this)/;
var checkHasSuper = (function () {
var sourceAvailable = (function () {
return this;
- }).toString().indexOf('return this;') > -1;
+ }).toString().indexOf('return this') > -1;
if (sourceAvailable) {
return function checkHasSuper(func) {
return HAS_SUPER_PATTERN.test(func.toString());
};
@@ -20872,10 +20881,11 @@
return function checkHasSuper() {
return true;
};
})();
+ exports.checkHasSuper = checkHasSuper;
function ROOT() {}
ROOT.__hasSuper = false;
function hasSuper(func) {
if (func.__hasSuper === undefined) {
@@ -22559,11 +22569,11 @@
@submodule ember-routing-views
*/
'use strict';
- _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.1.0';
+ _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.1.2';
/**
`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.
@@ -22884,11 +22894,11 @@
},
queryParams: null,
qualifiedRouteName: _emberMetalComputed.computed('targetRouteName', '_routing.currentState', function computeLinkToComponentQualifiedRouteName() {
- var params = this.attrs.params.slice();
+ var params = _emberMetalProperty_get.get(this, 'params').slice();
var lastParam = params[params.length - 1];
if (lastParam && lastParam.isQueryParams) {
params.pop();
}
var onlyQueryParamsSupplied = this[_emberHtmlbarsNodeManagersComponentNodeManager.HAS_BLOCK] ? params.length === 0 : params.length === 1;
@@ -22976,11 +22986,11 @@
var queryParams = undefined;
var attrs = this.attrs;
// Do not mutate params in place
- var params = attrs.params.slice();
+ var params = _emberMetalProperty_get.get(this, 'params').slice();
if (attrs.disabledWhen) {
this.set('disabled', attrs.disabledWhen);
}
@@ -23040,11 +23050,11 @@
@submodule ember-routing-views
*/
'use strict';
- _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.1.0';
+ _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.1.2';
var CoreOutletView = _emberViewsViewsView.default.extend({
defaultTemplate: _emberHtmlbarsTemplatesTopLevelView.default,
init: function () {
@@ -36687,11 +36697,11 @@
options.plugins = plugins;
options.buildMeta = function buildMeta(program) {
return {
topLevel: detectTopLevel(program),
- revision: 'Ember@2.1.0',
+ revision: 'Ember@2.1.2',
loc: program.loc,
moduleName: options.moduleName
};
};
@@ -40140,11 +40150,11 @@
exports.default = Component;
});
enifed('ember-views/views/container_view', ['exports', 'ember-metal/core', 'ember-runtime/mixins/mutable_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, _emberRuntimeMixinsMutable_array, _emberViewsViewsView, _emberMetalProperty_get, _emberMetalProperty_set, _emberMetalMixin, _emberMetalEvents, _emberHtmlbarsTemplatesContainerView) {
'use strict';
- _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.1.0';
+ _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.1.2';
/**
@module ember
@submodule ember-views
*/
@@ -45863,11 +45873,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 */
\ No newline at end of file