diff options
Diffstat (limited to 'js/document/views')
-rwxr-xr-x | js/document/views/base.js | 35 | ||||
-rwxr-xr-x | js/document/views/code.js | 32 | ||||
-rwxr-xr-x | js/document/views/design.js | 83 |
3 files changed, 131 insertions, 19 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 | //////////////////////////////////////////////////////////////////////// |
diff --git a/js/document/views/code.js b/js/document/views/code.js index 5467b0f1..7df7e1c6 100755 --- a/js/document/views/code.js +++ b/js/document/views/code.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 | //////////////////////////////////////////////////////////////////////// |
@@ -150,4 +174,4 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, { | |||
150 | //////////////////////////////////////////////////////////////////// | 174 | //////////////////////////////////////////////////////////////////// |
151 | }); | 175 | }); |
152 | //////////////////////////////////////////////////////////////////////// | 176 | //////////////////////////////////////////////////////////////////////// |
153 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | 177 | //////////////////////////////////////////////////////////////////////// |
diff --git a/js/document/views/design.js b/js/document/views/design.js index 6a60e1f9..ed98b660 100755 --- a/js/document/views/design.js +++ b/js/document/views/design.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 | //////////////////////////////////////////////////////////////////////// |
@@ -285,7 +309,8 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { | |||
285 | userStyles, | 309 | userStyles, |
286 | stags = this.document.getElementsByTagName('style'), | 310 | stags = this.document.getElementsByTagName('style'), |
287 | ltags = this.document.getElementsByTagName('link'), i, orgNodes, | 311 | ltags = this.document.getElementsByTagName('link'), i, orgNodes, |
288 | scripttags = this.document.getElementsByTagName('script'); | 312 | scripttags = this.document.getElementsByTagName('script'), |
313 | videotags = this.document.getElementsByTagName('video'); | ||
289 | //Temporarily checking for disabled special case (we must enabled for Ninja to access styles) | 314 | //Temporarily checking for disabled special case (we must enabled for Ninja to access styles) |
290 | this.ninjaDisableAttribute(stags); | 315 | this.ninjaDisableAttribute(stags); |
291 | this.ninjaDisableAttribute(ltags); | 316 | this.ninjaDisableAttribute(ltags); |
@@ -308,10 +333,25 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { | |||
308 | } | 333 | } |
309 | } | 334 | } |
310 | } | 335 | } |
311 | 336 | //Checking for video tags | |
337 | if (videotags.length > 0) { | ||
338 | //Looping through all video tags | ||
339 | for (i = 0; i < videotags.length; i++) { | ||
340 | //Stopping all videos from playing on open | ||
341 | videotags[i].addEventListener('canplay', function(e) { | ||
342 | //TODO: Figure out why the video must be seeked to the end before pausing | ||
343 | var time = Math.ceil(this.duration); | ||
344 | //Trying to display the last frame (doing minus 2 seconds if long video) | ||
345 | if (time > 2) this.currentTime = time - 2; | ||
346 | else if (time > 1) this.currentTime = time - 1; | ||
347 | else this.currentTime = time || 0; | ||
348 | //Pauing video | ||
349 | this.pause(); | ||
350 | }, false); | ||
351 | } | ||
352 | } | ||
312 | // Assign the modelGenerator reference from the template to our own modelGenerator | 353 | // Assign the modelGenerator reference from the template to our own modelGenerator |
313 | this.document.modelGenerator = ElementModel.modelGenerator; | 354 | this.document.modelGenerator = ElementModel.modelGenerator; |
314 | |||
315 | //Checking for script tags then parsing check for montage and webgl | 355 | //Checking for script tags then parsing check for montage and webgl |
316 | if (scripttags.length > 0) { | 356 | if (scripttags.length > 0) { |
317 | //Checking and initializing webGL | 357 | //Checking and initializing webGL |
@@ -497,9 +537,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { | |||
497 | // | 537 | // |
498 | pauseVideos:{ | 538 | pauseVideos:{ |
499 | value:function(){ | 539 | value:function(){ |
500 | var i, videos = this.document.getElementsByTagName("video"); | 540 | if(this.document) { |
501 | for(i = 0; i < videos.length; i++){ | 541 | var i, videos = this.document.getElementsByTagName("video"); |
502 | if(!videos[i].paused) videos[i].pause(); | 542 | for(i = 0; i < videos.length; i++){ |
543 | if(!videos[i].paused) videos[i].pause(); | ||
544 | } | ||
503 | } | 545 | } |
504 | } | 546 | } |
505 | }, | 547 | }, |
@@ -523,9 +565,28 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { | |||
523 | videos[i].src = ""; | 565 | videos[i].src = ""; |
524 | } | 566 | } |
525 | } | 567 | } |
526 | } | 568 | }, |
527 | //////////////////////////////////////////////////////////////////// | 569 | //////////////////////////////////////////////////////////////////// |
528 | //////////////////////////////////////////////////////////////////// | 570 | //////////////////////////////////////////////////////////////////// |
571 | toggleWebGlAnimation: { | ||
572 | value: function(show) { | ||
573 | if(this.document) { | ||
574 | var glCanvases = this.document.querySelectorAll('[data-RDGE-id]'), | ||
575 | glShapeModel; | ||
576 |