diff options
author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/document/views/base.js | |
parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 | } |