diff options
Diffstat (limited to 'js/document/views/base.js')
-rwxr-xr-x | js/document/views/base.js | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/js/document/views/base.js b/js/document/views/base.js index d13dce1a..18676d1f 100755 --- a/js/document/views/base.js +++ b/js/document/views/base.js | |||
@@ -1,7 +1,31 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | All Rights Reserved. |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | BSD License. |
5 | |||
6 | Redistribution and use in source and binary forms, with or without | ||
7 | modification, are permitted provided that the following conditions are met: | ||
8 | |||
9 | - Redistributions of source code must retain the above copyright notice, | ||
10 | this list of conditions and the following disclaimer. | ||
11 | - Redistributions in binary form must reproduce the above copyright | ||
12 | notice, this list of conditions and the following disclaimer in the | ||
13 | documentation and/or other materials provided with the distribution. | ||
14 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
15 | may be used to endorse or promote products derived from this software | ||
16 | without specific prior written permission. | ||
17 | |||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
25 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
26 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
28 | POSSIBILITY OF SUCH DAMAGE. | ||
5 | </copyright> */ | 29 | </copyright> */ |
6 | 30 | ||
7 | //////////////////////////////////////////////////////////////////////// | 31 | //////////////////////////////////////////////////////////////////////// |
@@ -40,6 +64,7 @@ exports.BaseDocumentView = Montage.create(Component, { | |||
40 | if (this.iframe) { | 64 | if (this.iframe) { |
41 | this.iframe.style.display = 'block'; | 65 | this.iframe.style.display = 'block'; |
42 | this.iframe.style.opacity = 1; | 66 | this.iframe.style.opacity = 1; |
67 | this.toggleWebGlAnimation(true); | ||
43 | } else { | 68 | } else { |
44 | console.log('Error: View has no iframe to show!'); | 69 | console.log('Error: View has no iframe to show!'); |
45 | } | 70 | } |
@@ -54,6 +79,8 @@ exports.BaseDocumentView = Montage.create(Component, { | |||
54 | if (this.iframe) { | 79 | if (this.iframe) { |
55 | this.iframe.style.display = 'none'; | 80 | this.iframe.style.display = 'none'; |
56 | this.iframe.style.opacity = 0; | 81 | this.iframe.style.opacity = 0; |
82 | this.pauseVideos(); | ||
83 | this.toggleWebGlAnimation(false); | ||
57 | } else { | 84 | } else { |
58 | console.log('Error: View has no iframe to hide!'); | 85 | console.log('Error: View has no iframe to hide!'); |
59 | } | 86 | } |
@@ -65,4 +92,4 @@ exports.BaseDocumentView = Montage.create(Component, { | |||
65 | //////////////////////////////////////////////////////////////////// | 92 | //////////////////////////////////////////////////////////////////// |
66 | }); | 93 | }); |
67 | //////////////////////////////////////////////////////////////////////// | 94 | //////////////////////////////////////////////////////////////////////// |
68 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | 95 | //////////////////////////////////////////////////////////////////////// |