diff options
author | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
commit | 1839f24e8dcbad38d1381bbcd65c17a9caa45987 (patch) | |
tree | 516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /js/document/views/base.js | |
parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
parent | febfdb18042d1c73ac58ee4e35c5f176428dee00 (diff) | |
download | ninja-1839f24e8dcbad38d1381bbcd65c17a9caa45987.tar.gz |
Merge pull request #346 from mqg734/MaterialsUI
UI support for preview, edit, duplicate and delete of WebGL Materials.
Diffstat (limited to 'js/document/views/base.js')
-rwxr-xr-x | js/document/views/base.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/document/views/base.js b/js/document/views/base.js index e771702d..18676d1f 100755 --- a/js/document/views/base.js +++ b/js/document/views/base.js | |||
@@ -64,6 +64,7 @@ exports.BaseDocumentView = Montage.create(Component, { | |||
64 | if (this.iframe) { | 64 | if (this.iframe) { |
65 | this.iframe.style.display = 'block'; | 65 | this.iframe.style.display = 'block'; |
66 | this.iframe.style.opacity = 1; | 66 | this.iframe.style.opacity = 1; |
67 | this.toggleWebGlAnimation(true); | ||
67 | } else { | 68 | } else { |
68 | console.log('Error: View has no iframe to show!'); | 69 | console.log('Error: View has no iframe to show!'); |
69 | } | 70 | } |
@@ -78,6 +79,8 @@ exports.BaseDocumentView = Montage.create(Component, { | |||
78 | if (this.iframe) { | 79 | if (this.iframe) { |
79 | this.iframe.style.display = 'none'; | 80 | this.iframe.style.display = 'none'; |
80 | this.iframe.style.opacity = 0; | 81 | this.iframe.style.opacity = 0; |
82 | this.pauseVideos(); | ||
83 | this.toggleWebGlAnimation(false); | ||
81 | } else { | 84 | } else { |
82 | console.log('Error: View has no iframe to hide!'); | 85 | console.log('Error: View has no iframe to hide!'); |
83 | } | 86 | } |