aboutsummaryrefslogtreecommitdiff
path: root/js/document/views
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/document/views
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document/views')
-rwxr-xr-xjs/document/views/base.js72
-rwxr-xr-xjs/document/views/code.js18
-rwxr-xr-xjs/document/views/design.js644
3 files changed, 367 insertions, 367 deletions
diff --git a/js/document/views/base.js b/js/document/views/base.js
index 18676d1f..14ee8e6c 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -30,66 +30,66 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var 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//
38exports.BaseDocumentView = Montage.create(Component, { 38exports.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 this.toggleWebGlAnimation(true); 67 this.toggleWebGlAnimation(true);
68 } else { 68 } else {
69 console.log('Error: View has no iframe to show!'); 69 console.log('Error: View has no iframe to show!');
70 } 70 }
71 // 71 //
72 if (callback) callback(); 72 if (callback) callback();
73 } 73 }
74 }, 74 },
75 //////////////////////////////////////////////////////////////////// 75 ////////////////////////////////////////////////////////////////////
76 // 76 //
77 hide: { 77 hide: {
78 value: function (callback) { 78 value: function (callback) {
79 if (this.iframe) { 79 if (this.iframe) {
80 this.iframe.style.display = 'none'; 80 this.iframe.style.display = 'none';
81 this.iframe.style.opacity = 0; 81 this.iframe.style.opacity = 0;
82 this.pauseVideos(); 82 this.pauseVideos();
83 this.toggleWebGlAnimation(false); 83 this.toggleWebGlAnimation(false);
84 } else { 84 } else {
85 console.log('Error: View has no iframe to hide!'); 85 console.log('Error: View has no iframe to hide!');
86 } 86 }
87 // 87 //
88 if (callback) callback(); 88 if (callback) callback();
89 } 89 }
90 } 90 }
91 //////////////////////////////////////////////////////////////////// 91 ////////////////////////////////////////////////////////////////////
92 //////////////////////////////////////////////////////////////////// 92 ////////////////////////////////////////////////////////////////////
93}); 93});
94//////////////////////////////////////////////////////////////////////// 94////////////////////////////////////////////////////////////////////////
95//////////////////////////////////////////////////////////////////////// 95////////////////////////////////////////////////////////////////////////
diff --git a/js/document/views/code.js b/js/document/views/code.js
index 7df7e1c6..6648b353 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -30,15 +30,15 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var Montage = require("montage/core/core").Montage,
34 Component = require("montage/ui/component").Component, 34 Component = require("montage/ui/component").Component,
35 BaseDocumentView = require("js/document/views/base").BaseDocumentView; 35 BaseDocumentView = require("js/document/views/base").BaseDocumentView;
36//////////////////////////////////////////////////////////////////////// 36////////////////////////////////////////////////////////////////////////
37// 37//
38exports.CodeDocumentView = Montage.create(BaseDocumentView, { 38exports.CodeDocumentView = Montage.create(BaseDocumentView, {
39 //////////////////////////////////////////////////////////////////// 39 ////////////////////////////////////////////////////////////////////
40 // 40 //
41 hasTemplate: { 41 hasTemplate: {
42 value: false 42 value: false
43 }, 43 },
44 //////////////////////////////////////////////////////////////////// 44 ////////////////////////////////////////////////////////////////////
@@ -103,7 +103,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
103 //Creates a new instance of a code editor 103 //Creates a new instance of a code editor
104 initializeTextView: { 104 initializeTextView: {
105 value: function(file, textDocument) { 105 value: function(file, textDocument) {
106 // 106 //
107 var type; 107 var type;
108 // 108 //
109 switch(file.extension) { 109 switch(file.extension) {
@@ -146,7 +146,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
146 // 146 //
147 show: { 147 show: {
148 value: function (callback) { 148 value: function (callback) {
149 // 149 //
150 this.textViewContainer.style.display = "block"; 150 this.textViewContainer.style.display = "block";
151 // 151 //
152 if (callback) callback(); 152 if (callback) callback();
@@ -156,7 +156,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
156 // 156 //
157 hide: { 157 hide: {
158 value: function (callback) { 158 value: function (callback) {
159 // 159 //
160 this.textViewContainer.style.display = "none"; 160 this.textViewContainer.style.display = "none";
161 // 161 //
162 if (callback) callback(); 162 if (callback) callback();
diff --git a/js/document/views/design.js b/js/document/views/design.js
index ed98b660..c7f57e58 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -30,50 +30,50 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var Montage = require("montage/core/core").Montage,
34 BaseDocumentView = require("js/document/views/base").BaseDocumentView, 34 BaseDocumentView = require("js/document/views/base").BaseDocumentView,
35 ElementModel = require("js/models/element-model"); 35 ElementModel = require("js/models/element-model");
36//////////////////////////////////////////////////////////////////////// 36////////////////////////////////////////////////////////////////////////
37// 37//
38exports.DesignDocumentView = Montage.create(BaseDocumentView, { 38exports.DesignDocumentView = Montage.create(BaseDocumentView, {
39 //////////////////////////////////////////////////////////////////// 39 ////////////////////////////////////////////////////////////////////
40 // 40 //
41 hasTemplate: { 41 hasTemplate: {
42 value: false 42 value: false
43 }, 43 },
44 //////////////////////////////////////////////////////////////////// 44 ////////////////////////////////////////////////////////////////////
45 // 45 //
46 _callback: { 46 _callback: {
47 value: null 47 value: null
48 }, 48 },
49 //////////////////////////////////////////////////////////////////// 49 ////////////////////////////////////////////////////////////////////
50 // 50 //
51 _viewCallback: { 51 _viewCallback: {
52 value: null 52 value: null
53 }, 53 },
54 //////////////////////////////////////////////////////////////////// 54 ////////////////////////////////////////////////////////////////////
55 // 55 //
56 _template: { 56 _template: {
57 value: null 57 value: null
58 }, 58 },
59 //////////////////////////////////////////////////////////////////// 59 ////////////////////////////////////////////////////////////////////
60 // 60 //
61 _bodyFragment: { 61 _bodyFragment: {
62 value: null 62 value: null
63 }, 63 },
64 //////////////////////////////////////////////////////////////////// 64 ////////////////////////////////////////////////////////////////////
65 // 65 //
66 _headFragment: { 66 _headFragment: {