Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Upgrade ember-cloaking to avoid `setProperties` error

This commit is contained in:
Robin Ward 2014-06-24 12:13:48 -04:00
parent a7ad7f6a45
commit b43ea8bcd1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vendor/assets/javascripts/ember-cloaking.js vendored
View File

@ -186,12 +186,12 @@
Em.run.schedule('afterRender', this, function() { Em.run.schedule('afterRender', this, function() {
onscreenCloaks.forEach(function (v) { onscreenCloaks.forEach(function (v) {
if(v && v.uncloak) { if(v && v.uncloak && (v._state || v.state) === 'inDOM') {
v.uncloak(); v.uncloak();
} }
}); });
toCloak.forEach(function (v) { v.cloak(); }); toCloak.forEach(function (v) { v.cloak(); });
if(self._nextUncloak){Em.run.cancel(self._nextUncloak)} if (self._nextUncloak) { Em.run.cancel(self._nextUncloak); }
self._nextUncloak = Em.run.later(self, self.uncloakQueue,50); self._nextUncloak = Em.run.later(self, self.uncloakQueue,50);
}); });
@ -369,15 +369,15 @@
} }
}, },
willDestroyElement: function(){ _removeContainedView: function(){
if(this._containedView){ if(this._containedView){
this._containedView.remove(); this._containedView.remove();
this._containedView = null; this._containedView = null;
} }
this._super(); this._super();
}, }.on('willDestroyElement'),
didInsertElement: function(){ _setHeights: function(){
if (!this._containedView) { if (!this._containedView) {
// setting default height // setting default height
// but do not touch if height already defined // but do not touch if height already defined
@ -390,7 +390,7 @@
this.$().css('height', defaultHeight); this.$().css('height', defaultHeight);
} }
} }
}, }.on('didInsertElement'),
/** /**
Render the cloaked view if applicable. Render the cloaked view if applicable.