dist/ember.prod.js in ember-source-1.13.8 vs dist/ember.prod.js in ember-source-1.13.9
- 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 1.13.8
+ * @version 1.13.9
*/
(function() {
var enifed, requireModule, eriuqer, requirejs, Ember;
var mainContext = this;
@@ -9172,11 +9172,11 @@
@submodule ember-htmlbars
*/
"use strict";
- _emberHtmlbarsTemplatesTopLevelView["default"].meta.revision = 'Ember@1.13.8';
+ _emberHtmlbarsTemplatesTopLevelView["default"].meta.revision = 'Ember@1.13.9';
exports["default"] = {
willRender: function (renderNode, env) {
env.view.ownerView._outlets.push(renderNode);
},
@@ -10090,11 +10090,11 @@
component = createComponent(component, isAngleBracket, createOptions, renderNode, env, attrs, proto);
// If the component specifies its template via the `layout` or `template`
// properties instead of using the template looked up in the container, get
// them now that we have the component instance.
- var result = extractComponentTemplates(component, templates);
+ var result = extractComponentTemplates(component, templates, layout);
layout = result.layout || layout;
templates = result.templates || templates;
var results = _emberViewsSystemBuildComponentTemplate["default"]({ layout: layout, component: component, isAngleBracket: isAngleBracket }, attrs, { templates: templates, scope: parentScope });
@@ -10147,11 +10147,11 @@
attrs[positionalParams[i]] = param;
}
}
}
- function extractComponentTemplates(component, _templates) {
+ function extractComponentTemplates(component, _templates, _layout) {
// Even though we looked up a layout from the container earlier, the
// component may specify a `layout` property that overrides that.
// The component may also provide a `template` property we should
// respect (though this behavior is deprecated).
var componentLayout = _emberMetalProperty_get.get(component, 'layout');
@@ -10169,15 +10169,21 @@
if (componentLayout) {
layout = componentLayout;
templates = extractLegacyTemplate(_templates, componentTemplate);
} else if (componentTemplate) {
- // If the component has a `template` but no `layout`, use the template
- // as the layout.
- layout = componentTemplate;
+ if (_layout) {
+ // If the component has no `layout`, but one was found during
+ // `lookupComponent` in calling `create` function, use that
+ layout = _layout;
+ } else {
+ // If the component has a `template` but no `layout`, use the template
+ // as the layout.
+ layout = componentTemplate;
+ }
templates = _templates;
- }
+ }
return { layout: layout, templates: templates };
}
// 2.0TODO: Remove legacy behavior
@@ -12501,10 +12507,12 @@
Renderer.prototype.setAttrs = function (view, attrs) {
_emberMetalProperty_set.set(view, 'attrs', attrs);
}; // set attrs the first time
Renderer.prototype.componentInitAttrs = function (component, attrs) {
+ // for attrs-proxy support
+ component.trigger('_internalDidReceiveAttrs');
component.trigger('didInitAttrs', { attrs: attrs });
component.trigger('didReceiveAttrs', { newAttrs: attrs });
}; // set attrs the first time
Renderer.prototype.didInsertElement = function (view) {
@@ -12541,10 +12549,12 @@
_emberMetalSet_properties["default"](component.attrs, newAttrs);
} else {
_emberMetalProperty_set.set(component, 'attrs', newAttrs);
}
+ // for attrs-proxy support
+ component.trigger('_internalDidReceiveAttrs');
component.trigger('didUpdateAttrs', { oldAttrs: oldAttrs, newAttrs: newAttrs });
component.trigger('didReceiveAttrs', { oldAttrs: oldAttrs, newAttrs: newAttrs });
};
Renderer.prototype.willUpdate = function (view, attrs) {
@@ -15432,11 +15442,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 1.13.8
+ @version 1.13.9
@public
*/
'use strict';
@@ -15466,15 +15476,15 @@
/**
The semantic version.
@property VERSION
@type String
- @default '1.13.8'
+ @default '1.13.9'
@static
@public
*/
- Ember.VERSION = '1.13.8';
+ Ember.VERSION = '1.13.9';
/**
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
@@ -24340,11 +24350,11 @@
@submodule ember-routing-views
*/
"use strict";
- _emberHtmlbarsTemplatesLinkTo["default"].meta.revision = 'Ember@1.13.8';
+ _emberHtmlbarsTemplatesLinkTo["default"].meta.revision = 'Ember@1.13.9';
var linkComponentClassNameBindings = ['active', 'loading', 'disabled'];
linkComponentClassNameBindings = ['active', 'loading', 'disabled', 'transitioningIn', 'transitioningOut'];
@@ -24872,11 +24882,11 @@
@submodule ember-routing-views
*/
"use strict";
- _emberHtmlbarsTemplatesTopLevelView["default"].meta.revision = 'Ember@1.13.8';
+ _emberHtmlbarsTemplatesTopLevelView["default"].meta.revision = 'Ember@1.13.9';
var CoreOutletView = _emberViewsViewsView["default"].extend({
defaultTemplate: _emberHtmlbarsTemplatesTopLevelView["default"],
init: function () {
@@ -41740,11 +41750,11 @@
}
options.plugins = plugins;
options.buildMeta = function buildMeta(program) {
return {
- revision: 'Ember@1.13.8',
+ revision: 'Ember@1.13.9',
loc: program.loc,
moduleName: options.moduleName
};
};
@@ -41954,11 +41964,11 @@
initializeShape: _emberMetalEvents.on('init', function () {
this._isDispatchingAttrs = false;
}),
- didReceiveAttrs: function () {
+ _internalDidReceiveAttrs: function () {
this._super();
this._isDispatchingAttrs = true;
this._propagateAttrsToThis();
this._isDispatchingAttrs = false;
},
@@ -45709,10 +45719,10 @@
});
// Ember.assert, Ember.Handlebars
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/enumerable_utils", "ember-metal/mixin", "ember-metal/events", "ember-htmlbars/templates/container-view"], function (exports, _emberMetalCore, _emberRuntimeMixinsMutable_array, _emberViewsViewsView, _emberMetalProperty_get, _emberMetalProperty_set, _emberMetalEnumerable_utils, _emberMetalMixin, _emberMetalEvents, _emberHtmlbarsTemplatesContainerView) {
"use strict";
- _emberHtmlbarsTemplatesContainerView["default"].meta.revision = 'Ember@1.13.8';
+ _emberHtmlbarsTemplatesContainerView["default"].meta.revision = 'Ember@1.13.9';
/**
@module ember
@submodule ember-views
*/
\ No newline at end of file