mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 09:36:19 -05:00
Patch ember-cloaking to work in Ember 1.7 as well as 1.6
This commit is contained in:
parent
40684ff7e6
commit
f58c0e1f22
1 changed files with 6 additions and 1 deletions
7
vendor/assets/javascripts/ember-cloaking.js
vendored
7
vendor/assets/javascripts/ember-cloaking.js
vendored
|
@ -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');
|
||||
|
|
Loading…
Reference in a new issue