From f58c0e1f22e23e227643adaf07050af4c8c27a97 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 29 Oct 2014 14:21:05 -0400 Subject: [PATCH] Patch ember-cloaking to work in Ember 1.7 as well as 1.6 --- vendor/assets/javascripts/ember-cloaking.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js index ccb614db122..07b3506defa 100644 --- a/vendor/assets/javascripts/ember-cloaking.js +++ b/vendor/assets/javascripts/ember-cloaking.js @@ -406,7 +406,12 @@ if (containedView && (containedView._state || containedView.state) !== 'inDOM') { containedView.triggerRecursively('willInsertElement'); containedView.renderToBuffer(buffer); - containedView.transitionTo('inDOM'); + if (Ember.View.prototype._transitionTo) { + containedView._transitionTo('inDOM'); + } else { + containedView.transitionTo('inDOM'); + } + Em.run.schedule('afterRender', function() { if(self._containedView) { self._containedView.triggerRecursively('didInsertElement');