diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/document/views/base.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/document/views/base.js')
| -rwxr-xr-x | js/document/views/base.js | 75 |
1 files changed, 39 insertions, 36 deletions
diff --git a/js/document/views/base.js b/js/document/views/base.js index e771702d..14ee8e6c 100755 --- a/js/document/views/base.js +++ b/js/document/views/base.js | |||
| @@ -30,63 +30,66 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 30 | 30 | ||
| 31 | //////////////////////////////////////////////////////////////////////// | 31 | //////////////////////////////////////////////////////////////////////// |
| 32 | // | 32 | // |
| 33 | var Montage = require("montage/core/core").Montage, | 33 | var Montage = require("montage/core/core").Montage, |
| 34 | Component = require("montage/ui/component").Component, | 34 | Component = require("montage/ui/component").Component, |
| 35 | UrlParser = require("js/document/helpers/url-parser").UrlParser; | 35 | UrlParser = require("js/document/helpers/url-parser").UrlParser; |
| 36 | //////////////////////////////////////////////////////////////////////// | 36 | //////////////////////////////////////////////////////////////////////// |
| 37 | // | 37 | // |
| 38 | exports.BaseDocumentView = Montage.create(Component, { | 38 | exports.BaseDocumentView = Montage.create(Component, { |
| 39 | //////////////////////////////////////////////////////////////////// | 39 | //////////////////////////////////////////////////////////////////// |
| 40 | // | 40 | // |
| 41 | hasTemplate: { | 41 | hasTemplate: { |
| 42 | value: false | 42 | value: false |
| 43 | }, | 43 | }, |
| 44 | //////////////////////////////////////////////////////////////////// | 44 | //////////////////////////////////////////////////////////////////// |
| 45 | // | 45 | // |
| 46 | urlParser: { | 46 | urlParser: { |
| 47 | value: UrlParser | 47 | value: UrlParser |
| 48 | }, | 48 | }, |
| 49 | //////////////////////////////////////////////////////////////////// | 49 | //////////////////////////////////////////////////////////////////// |
| 50 | // | 50 | // |
| 51 | _iframe: { | 51 | _iframe: { |
| 52 | value: null | 52 | value: null |
| 53 | }, | 53 | }, |
| 54 | //////////////////////////////////////////////////////////////////// | 54 | //////////////////////////////////////////////////////////////////// |
| 55 | //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view) | 55 | //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view) |
| 56 | iframe: { | 56 | iframe: { |
| 57 | get: function() {return this._iframe;}, | 57 | get: function() {return this._iframe;}, |
| 58 | set: function(value) {this._iframe= value;} | 58 | set: function(value) {this._iframe= value;} |
| 59 | }, | 59 | }, |
| 60 | //////////////////////////////////////////////////////////////////// | 60 | //////////////////////////////////////////////////////////////////// |
| 61 | // | 61 | // |
| 62 | show: { | 62 | show: { |
| 63 | value: function (callback) { | 63 | value: function (callback) { |
| 64 | if (this.iframe) { | 64 | if (this.iframe) { |
| 65 | this.iframe.style.display = 'block'; | 65 | this.iframe.style.display = 'block'; |
| 66 | this.iframe.style.opacity = 1; | 66 | this.iframe.style.opacity = 1; |
| 67 | } else { | 67 | this.toggleWebGlAnimation(true); |
| 68 | console.log('Error: View has no iframe to show!'); | 68 | } else { |
| 69 | } | 69 | console.log('Error: View has no iframe to show!'); |
| 70 | // | 70 | } |
| 71 | if (callback) callback(); | 71 | // |
| 72 | if (callback) callback(); | ||
| 72 | } | 73 | } |
| 73 | }, | 74 | }, |
| 74 | //////////////////////////////////////////////////////////////////// | 75 | //////////////////////////////////////////////////////////////////// |
| 75 | // | 76 | // |
| 76 | hide: { | 77 | hide: { |
| 77 | value: function (callback) { | 78 | value: function (callback) { |
| 78 | if (this.iframe) { | 79 | if (this.iframe) { |
| 79 | this.iframe.style.display = 'none'; | 80 | this.iframe.style.display = 'none'; |
| 80 | this.iframe.style.opacity = 0; | 81 | this.iframe.style.opacity = 0; |
| 81 | } else { | 82 | this.pauseVideos(); |
| 82 | console.log('Error: View has no iframe to hide!'); | 83 | this.toggleWebGlAnimation(false); |
| 83 | } | 84 | } else { |
| 84 | // | 85 | console.log('Error: View has no iframe to hide!'); |
| 85 | if (callback) callback(); | 86 | } |
| 87 | // | ||
| 88 | if (callback) callback(); | ||
| 86 | } | 89 | } |
| 87 | } | 90 | } |
| 88 | //////////////////////////////////////////////////////////////////// | 91 | //////////////////////////////////////////////////////////////////// |
| 89 | //////////////////////////////////////////////////////////////////// | 92 | //////////////////////////////////////////////////////////////////// |
| 90 | }); | 93 | }); |
| 91 | //////////////////////////////////////////////////////////////////////// | 94 | //////////////////////////////////////////////////////////////////////// |
| 92 | //////////////////////////////////////////////////////////////////////// | 95 | //////////////////////////////////////////////////////////////////////// |