From 2da05a4c71bfe9b136384d9e94fbfbef19f24550 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 27 Jun 2012 17:28:06 -0700 Subject: Performance fix for WebGL materials playing even when the dialog/file is no longer in view. Also pausing videos when switching documents. Signed-off-by: Nivesh Rajbhandari --- js/document/views/base.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/document/views/base.js') diff --git a/js/document/views/base.js b/js/document/views/base.js index d13dce1a..89759195 100755 --- a/js/document/views/base.js +++ b/js/document/views/base.js @@ -40,6 +40,7 @@ exports.BaseDocumentView = Montage.create(Component, { if (this.iframe) { this.iframe.style.display = 'block'; this.iframe.style.opacity = 1; + this.toggleWebGlAnimation(true); } else { console.log('Error: View has no iframe to show!'); } @@ -54,6 +55,8 @@ exports.BaseDocumentView = Montage.create(Component, { if (this.iframe) { this.iframe.style.display = 'none'; this.iframe.style.opacity = 0; + this.pauseVideos(); + this.toggleWebGlAnimation(false); } else { console.log('Error: View has no iframe to hide!'); } -- cgit v1.2.3 From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/document/views/base.js | 72 +++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'js/document/views/base.js') diff --git a/js/document/views/base.js b/js/document/views/base.js index e771702d..0f40ab47 100755 --- a/js/document/views/base.js +++ b/js/document/views/base.js @@ -30,63 +30,63 @@ POSSIBILITY OF SUCH DAMAGE. //////////////////////////////////////////////////////////////////////// // -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - UrlParser = require("js/document/helpers/url-parser").UrlParser; +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component, + UrlParser = require("js/document/helpers/url-parser").UrlParser; //////////////////////////////////////////////////////////////////////// -// +// exports.BaseDocumentView = Montage.create(Component, { - //////////////////////////////////////////////////////////////////// - // - hasTemplate: { + //////////////////////////////////////////////////////////////////// + // + hasTemplate: { value: false }, //////////////////////////////////////////////////////////////////// - // - urlParser: { + // + urlParser: { value: UrlParser }, - //////////////////////////////////////////////////////////////////// - // - _iframe: { + //////////////////////////////////////////////////////////////////// + // + _iframe: { value: null }, //////////////////////////////////////////////////////////////////// - //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view) - iframe: { - get: function() {return this._iframe;}, + //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view) + iframe: { + get: function() {return this._iframe;}, set: function(value) {this._iframe= value;} }, - //////////////////////////////////////////////////////////////////// - // - show: { + //////////////////////////////////////////////////////////////////// + // + show: { value: function (callback) { - if (this.iframe) { - this.iframe.style.display = 'block'; + if (this.iframe) { + this.iframe.style.display = 'block'; this.iframe.style.opacity = 1; - } else { - console.log('Error: View has no iframe to show!'); - } - // - if (callback) callback(); + } else { + console.log('Error: View has no iframe to show!'); + } + // + if (callback) callback(); } }, //////////////////////////////////////////////////////////////////// - // - hide: { + // + hide: { value: function (callback) { - if (this.iframe) { - this.iframe.style.display = 'none'; + if (this.iframe) { + this.iframe.style.display = 'none'; this.iframe.style.opacity = 0; - } else { - console.log('Error: View has no iframe to hide!'); - } - // - if (callback) callback(); + } else { + console.log('Error: View has no iframe to hide!'); + } + // + if (callback) callback(); } } - //////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////// }); //////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/document/views/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/document/views/base.js') diff --git a/js/document/views/base.js b/js/document/views/base.js index 0f40ab47..89baa871 100755 --- a/js/document/views/base.js +++ b/js/document/views/base.js @@ -34,7 +34,7 @@ var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component, UrlParser = require("js/document/helpers/url-parser").UrlParser; //////////////////////////////////////////////////////////////////////// -// +// exports.BaseDocumentView = Montage.create(Component, { //////////////////////////////////////////////////////////////////// // -- cgit v1.2.3 From fdbec324dad4ab33d97282ab021d2c1661bc097c Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Mon, 9 Jul 2012 16:27:52 -0700 Subject: BSD License --- js/document/views/base.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'js/document/views/base.js') diff --git a/js/document/views/base.js b/js/document/views/base.js index 14ee8e6c..354651ae 100755 --- a/js/document/views/base.js +++ b/js/document/views/base.js @@ -1,24 +1,25 @@ /* -Copyright (c) 2012, Motorola Mobility, Inc +Copyright (c) 2012, Motorola Mobility LLC. All Rights Reserved. -BSD License. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - Neither the name of Motorola Mobility nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of Motorola Mobility LLC nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- cgit v1.2.3