Skip to content

Commit

Permalink
Merge pull request #12026 from rwjblue/remove-dep-keys
Browse files Browse the repository at this point in the history
[BUGFIX release] Remove wasted DK's for `template` and `layout`.
  • Loading branch information
rwjblue committed Aug 8, 2015
2 parents f1a3fe6 + 306778b commit 7c00823
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/ember-views/lib/views/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, {
@property template
@public
*/
template: computed('_template', {
template: computed({
get() {
Ember.deprecate(`Accessing 'template' in ${this} is deprecated. To determine if a block was specified to ${this} please use '{{#if hasBlock}}' in the components layout.`,
false,
Expand All @@ -169,7 +169,7 @@ var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, {
}
}),

_template: computed('templateName', {
_template: computed({
get() {
if (this._deprecatedFlagForBlockProvided) {
return true;
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-views/lib/views/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ var View = CoreView.extend(
@type Function
@private
*/
template: computed('templateName', {
template: computed({
get() {
var templateName = get(this, 'templateName');
var template = this.templateForName(templateName, 'template');
Expand Down Expand Up @@ -762,7 +762,7 @@ var View = CoreView.extend(
@type Function
@public
*/
layout: computed('layoutName', {
layout: computed({
get(key) {
var layoutName = get(this, 'layoutName');
var layout = this.templateForName(layoutName, 'layout');
Expand Down

0 comments on commit 7c00823

Please sign in to comment.