diff options
author | Jose Antonio Marquez | 2012-05-22 14:47:02 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-22 14:47:02 -0700 |
commit | c5dad8ddc94b2e1c80565dfee072bda88e8880da (patch) | |
tree | 122197204fff1b8adccfc089d6e6869e8c310550 /js/document/views/base.js | |
parent | fe3b8f2d556c1919e4ad504f7f895f6c400d84d2 (diff) | |
parent | 9b6da637d9654727426c6d78f17e3804bbd84ce5 (diff) | |
download | ninja-c5dad8ddc94b2e1c80565dfee072bda88e8880da.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Conflicts:
js/document/document-html.js
Diffstat (limited to 'js/document/views/base.js')
-rwxr-xr-x | js/document/views/base.js | 2 |
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 | } |