Skip to content

Commit

Permalink
Merge pull request #11806 from martndemus/remove-controller-transitio…
Browse files Browse the repository at this point in the history
…n-to-and-replace-with

[CLEANUP beta] Remove deprecated Controller#transitionTo and Controller#replaceWith
  • Loading branch information
rwjblue committed Jul 18, 2015
2 parents 5a02548 + 1bf383a commit 896c9cd
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions packages/ember-routing/lib/ext/controller.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Ember from 'ember-metal/core'; // FEATURES, deprecate
import { get } from 'ember-metal/property_get';
import ControllerMixin from 'ember-runtime/mixins/controller';

Expand Down Expand Up @@ -118,17 +117,6 @@ ControllerMixin.reopen({
return method.apply(target, arguments);
},

/**
@deprecated
@for Ember.ControllerMixin
@method transitionTo
@private
*/
transitionTo() {
Ember.deprecate('transitionTo is deprecated. Please use transitionToRoute.');
return this.transitionToRoute(...arguments);
},

/**
Transition into another route while replacing the current URL, if possible.
This will replace the current history entry instead of adding a new one.
Expand Down Expand Up @@ -190,17 +178,6 @@ ControllerMixin.reopen({
var target = get(this, 'target');
var method = target.replaceRoute || target.replaceWith;
return method.apply(target, arguments);
},

/**
@deprecated
@for Ember.ControllerMixin
@method replaceWith
@private
*/
replaceWith() {
Ember.deprecate('replaceWith is deprecated. Please use replaceRoute.');
return this.replaceRoute(...arguments);
}
});

Expand Down

0 comments on commit 896c9cd

Please sign in to comment.