aboutsummaryrefslogtreecommitdiff
path: root/js/document/views/base.js
diff options
context:
space:
mode:
authorEric Guzman2012-05-22 15:57:23 -0700
committerEric Guzman2012-05-22 15:57:23 -0700
commitad3b4595d7377e5bf75bcb8ad81007859b0a8a02 (patch)
treeecb7fe289824a625b1dc422a97c2236826081ec3 /js/document/views/base.js
parent0eb95ff2dbba1fe7213eed2e0140b4d07bda3dd5 (diff)
parent2b207ef8b2594927f8cd6cd63a8483d205cb86c4 (diff)
downloadninja-ad3b4595d7377e5bf75bcb8ad81007859b0a8a02.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/document/views/base.js')
-rwxr-xr-xjs/document/views/base.js2
1 files changed, 2 insertions, 0 deletions
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 }