Skip to content

Commit

Permalink
Merge pull request #12636 from rwjblue/ensure-tostring-has-slot-on-mi…
Browse files Browse the repository at this point in the history
…xin-prototype

[BUGFIX beta] Ensure Mixin.prototype.toString is defined.
  • Loading branch information
stefanpenner committed Nov 27, 2015
2 parents 4638cbc + 895bbd7 commit ca85208
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions packages/ember-metal/lib/mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,10 @@ MixinPrototype.applyPartial = function(obj) {
return applyMixin(obj, [this], true);
};

MixinPrototype.toString = function Mixin_toString() {
return '(unknown mixin)';
};

function _detect(curMixin, targetMixin, seen) {
var guid = guidFor(curMixin);

Expand Down

0 comments on commit ca85208

Please sign in to comment.