aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-22 14:42:43 -0700
committerValerio Virgillito2012-05-22 14:42:43 -0700
commit9b6da637d9654727426c6d78f17e3804bbd84ce5 (patch)
tree84f2d0eeb8af2bbd7325d66114c9cec6397bebcd /js/document
parent58df45d43614b5364aa84832c7c0aa06a9d086fc (diff)
downloadninja-9b6da637d9654727426c6d78f17e3804bbd84ce5.tar.gz
fixing a few document switching issues.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/document-html.js2
-rwxr-xr-xjs/document/views/base.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 983da966..bb391793 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -155,7 +155,7 @@ exports.HtmlDocument = Montage.create(Component, {
155 // Pause the videos 155 // Pause the videos
156 this.model.views.design.pauseVideos(); 156 this.model.views.design.pauseVideos();
157 157
158 this.model.isActive = false; 158// this.model.isActive = false;
159 } 159 }
160 }, 160 },
161 //////////////////////////////////////////////////////////////////// 161 ////////////////////////////////////////////////////////////////////
diff --git a/js/document/views/base.js b/js/document/views/base.js
index d1c65b5e..db72cc60 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -39,6 +39,7 @@ exports.BaseDocumentView = Montage.create(Component, {
39 value: function (callback) { 39 value: function (callback) {
40 if (this.iframe) { 40 if (this.iframe) {
41 this.iframe.style.display = 'block'; 41 this.iframe.style.display = 'block';
42 this.iframe.style.opacity = 1;
42 } else { 43 } else {
43 console.log('Error: View has no iframe to show!'); 44 console.log('Error: View has no iframe to show!');
44 } 45 }
@@ -52,6 +53,7 @@ exports.BaseDocumentView = Montage.create(Component, {
52 value: function (callback) { 53 value: function (callback) {
53 if (this.iframe) { 54 if (this.iframe) {
54 this.iframe.style.display = 'none'; 55 this.iframe.style.display = 'none';
56 this.iframe.style.opacity = 0;
55 } else { 57 } else {
56 console.log('Error: View has no iframe to hide!'); 58 console.log('Error: View has no iframe to hide!');
57 } 59 }