Skip to content

Commit

Permalink
Update controller.js
Browse files Browse the repository at this point in the history
  • Loading branch information
locks authored Jul 19, 2017
1 parent ad2e660 commit f2c1d87
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/ember-runtime/lib/mixins/controller.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Mixin, alias } from 'ember-metal';
import { deprecatingAlias } from 'ember-runtime';
import ActionHandler from './action_handler';
import ControllerContentModelAliasDeprecation from './controller_content_model_alias_deprecation';

/**
@class ControllerMixin
@namespace Ember
@uses Ember.ActionHandler
@private
*/
export default Mixin.create(ActionHandler, ControllerContentModelAliasDeprecation, {
export default Mixin.create(ActionHandler, {
/* ducktype as a controller */
isController: true,

Expand Down Expand Up @@ -44,6 +44,6 @@ export default Mixin.create(ActionHandler, ControllerContentModelAliasDeprecatio
/**
@private
*/
content: alias('model')
content: deprecatingAlias('model')

});

0 comments on commit f2c1d87

Please sign in to comment.