aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-15 23:34:52 -0700
committerValerio Virgillito2012-05-15 23:34:52 -0700
commit2b21e91a3343229bb87179e08be1e532fcf9b8f9 (patch)
tree5ae1e660d0e307fda84c3be6a66c243904d75225 /js/document/models
parent012a6e8fa8bfb56e1a50f3b2fc6058f3651701a2 (diff)
parent9db5c446337e266fd604eac79ec39c840ffebbbe (diff)
downloadninja-2b21e91a3343229bb87179e08be1e532fcf9b8f9.tar.gz
Merge pull request #237 from mencio/dom-architecture
Dom architecture - Fixed closing and opening a document
Diffstat (limited to 'js/document/models')
-rwxr-xr-xjs/document/models/base.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js
index e8eba89f..f9844b70 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -214,10 +214,11 @@ exports.BaseDocumentModel = Montage.create(Component, {
214 if (this.views.design && (!view || view === 'design')) { 214 if (this.views.design && (!view || view === 'design')) {
215 // 215 //
216 this.parentContainer.removeChild(this.views.design.iframe); 216 this.parentContainer.removeChild(this.views.design.iframe);
217 this.views.design.pauseAndStopVideos();
217 this.views.design = null; 218 this.views.design = null;
218 } 219 }
219 // 220 //
220 if (callback) callback(success); 221 return success;
221 } 222 }
222 } 223 }
223 //////////////////////////////////////////////////////////////////// 224 ////////////////////////////////////////////////////////////////////