FIX: More safety for going back while stuff is uncloaking

This commit is contained in:
Robin Ward
2014-06-24 13:50:24 -04:00
parent 8e382fa5ea
commit 3521fb97e4
2 changed files with 10 additions and 2 deletions

View File

@@ -186,7 +186,7 @@
Em.run.schedule('afterRender', this, function() {
onscreenCloaks.forEach(function (v) {
if(v && v.uncloak && (v._state || v.state) === 'inDOM') {
if(v && v.uncloak) {
v.uncloak();
}
});
@@ -298,6 +298,9 @@
@method uncloak
*/
uncloak: function() {
var state = this._state || this.state;
if (state !== 'inDOM' && state !== 'preRender') { return; }
if (!this._containedView) {
var model = this.get('content'),
controller = null,