codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patch ember-cloaking to work in Ember 1.7 as well as 1.6

Browse source
This commit is contained in:
Robin Ward 2014-10-29 14:21:05 -04:00
parent 40684ff7e6
commit f58c0e1f22
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
vendor/assets/javascripts/ember-cloaking.js vendored
View file

@ -406,7 +406,12 @@
if (containedView && (containedView._state || containedView.state) !== 'inDOM') { if (containedView && (containedView._state || containedView.state) !== 'inDOM') {
containedView.triggerRecursively('willInsertElement'); containedView.triggerRecursively('willInsertElement');
containedView.renderToBuffer(buffer); containedView.renderToBuffer(buffer);
containedView.transitionTo('inDOM'); if (Ember.View.prototype._transitionTo) {
containedView._transitionTo('inDOM');
} else {
containedView.transitionTo('inDOM');
}
Em.run.schedule('afterRender', function() { Em.run.schedule('afterRender', function() {
if(self._containedView) { if(self._containedView) {
self._containedView.triggerRecursively('didInsertElement'); self._containedView.triggerRecursively('didInsertElement');