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>
author: Valerio Virgillito 2012-07-09 14:35:44 -0700
committer: Valerio Virgillito 2012-07-09 14:35:44 -0700
commit: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree: 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/document/templates
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
4 files changed, 163 insertions, 163 deletions
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 6b15bb24..4f1abcf3 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -27,10 +27,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
-var Montage =                   require("montage/core/core").Montage,
+var Montage =           require("montage/core/core").Montage,
-    Component =                 require("montage/ui/component").Component,
+    Component =         require("montage/ui/component").Component,
-    Template =                  require("montage/ui/template").Template,
+    Template =          require("montage/ui/template").Template,
-    TemplateCreator =   require("tools/template/template-creator").TemplateCreator;
+    TemplateCreator =   require("tools/template/template-creator").TemplateCreator;
 //var njmodelGet = function njmodelGet() {
@@ -85,7 +85,7 @@ exports.Main = Montage.create(Component, {
                        var componentRequire = component[data.name];
                        var componentInstance = componentRequire.create();
-                                                componentInstance.identifier = data.identifier;
+                        componentInstance.identifier = data.identifier;
                        componentInstance.addEventListener("firstDraw", self, false);
                        componentInstance.element = element;
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 8b602867..719f4dbc 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -28,32 +28,32 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
- 
- 
-<!-- 
+<!--
-        NOTE(s):
+    NOTE(s):
-        All elements in the head of the document to be exclude from I/O
+    All elements in the head of the document to be exclude from I/O
-        must set the 'data-ninja-template'
+    must set the 'data-ninja-template'
-        data-ninja-template="true"
+    data-ninja-template="true"
 -->
 <html>
-        <head>
+    <head>
-        
-        <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
+        <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
-                * {
+            * {
                -webkit-animation: none !important;
-                        -webkit-transition-duration: 0s !important;
+                -webkit-transition-duration: 0s !important;
-                        -webkit-animation-duration: 0s !important;
+                -webkit-animation-duration: 0s !important;
-                        -webkit-animation-name: none !important;
+                -webkit-animation-name: none !important;
                -webkit-animation-fill-mode: none !important;
-                        }
+            }
-                        
-                        body {
+            body {
-                                margin: 0;
+                margin: 0;
-                        padding: 0;
+                padding: 0;
-                                position: absolute;
+                position: absolute;
-                        }
+            }
            html {
                overflow: scroll;
@@ -65,38 +65,38 @@ POSSIBILITY OF SUCH DAMAGE.
                background: #666;
            }
-                        .active-element-outline {
+            .active-element-outline {
-                        outline: #adff2f solid 2px;
+                outline: #adff2f solid 2px;
-                        }
+            }
-                        .nj-preset-transition {
+            .nj-preset-transition {
-                                -webkit-transition: all 450ms linear !important;
+                -webkit-transition: all 450ms linear !important;
-                        }
+            }
-                        
-                        ninjaloadinghack {
+            ninjaloadinghack {
-                                display: none;
+                display: none;
-                        }
+            }
-                        
-                        ninja-viewport, ninja-content {
+            ninja-viewport, ninja-content {
-                                display: block;
+                display: block;
-                margin: 0;
+                margin: 0;
-                padding: 0;
+                padding: 0;
-                border: 0;
+                border: 0;
-                position: absolute;
+                position: absolute;
-                overflow: visible;
+                overflow: visible;
-                top: 0;
+                top: 0;
-                left: 0;
+                left: 0;
-                background: transparent;
+                background: transparent;
-                        }
+            }
-                        
-                        ninja-viewport {
+            ninja-viewport {
-                background: #FFF;
+                background: #FFF;
-                }
+            }
-                        
-                        ninja-content {
+            ninja-content {
                -webkit-transform-style: preserve-3d;
                -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-                        }
+            }
            ::-webkit-scrollbar { width: 11px; height: 11px; }
            ::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; }
@@ -121,7 +121,7 @@ POSSIBILITY OF SUCH DAMAGE.
            ::-webkit-resizer:disabled { display: block; }
        </style>
-        
        <script type="text/javascript" data-ninja-template="true">
            function getElement(x,y) {
@@ -144,11 +144,11 @@ POSSIBILITY OF SUCH DAMAGE.
                set: function() {
                }
            });
-        </script>
+        </script>
-        
-        <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
+        <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
-    
-        <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+        <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
        <script type="text/montage-serialization" data-ninja-template="true">
        {
@@ -158,18 +158,18 @@ POSSIBILITY OF SUCH DAMAGE.
        }
        </script>
-        </head>
+    </head>
+    <body>
+        <ninjaloadinghack></ninjaloadinghack>
-        <body>
-                
-                <ninjaloadinghack></ninjaloadinghack>
-        
        <ninja-viewport>
-                    
-                    <ninja-content></ninja-content>
+            <ninja-content></ninja-content>
-                    
        </ninja-viewport>
-        
-        </body>
+    </body>
 </html>
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 2677ade6..98ab3506 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
author	Valerio Virgillito	2012-07-09 14:35:44 -0700
committer	Valerio Virgillito	2012-07-09 14:35:44 -0700
commit	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree	3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/document/templates
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js index 6b15bb24..4f1abcf3 100644 --- a/js/document/templates/app/main.js +++ b/js/document/templates/app/main.js
@@ -27,10 +27,10 @@ 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	27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28	POSSIBILITY OF SUCH DAMAGE.	28	POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	29	</copyright> */
30	var Montage = require("montage/core/core").Montage,	30	var Montage = require("montage/core/core").Montage,
31	Component = require("montage/ui/component").Component,	31	Component = require("montage/ui/component").Component,
32	Template = require("montage/ui/template").Template,	32	Template = require("montage/ui/template").Template,
33	TemplateCreator = require("tools/template/template-creator").TemplateCreator;	33	TemplateCreator = require("tools/template/template-creator").TemplateCreator;
34		34
35		35
36	//var njmodelGet = function njmodelGet() {	36	//var njmodelGet = function njmodelGet() {
@@ -85,7 +85,7 @@ exports.Main = Montage.create(Component, {
85	var componentRequire = component[data.name];	85	var componentRequire = component[data.name];
86	var componentInstance = componentRequire.create();	86	var componentInstance = componentRequire.create();
87		87
88	componentInstance.identifier = data.identifier;	88	componentInstance.identifier = data.identifier;
89	componentInstance.addEventListener("firstDraw", self, false);	89	componentInstance.addEventListener("firstDraw", self, false);
90		90
91	componentInstance.element = element;	91	componentInstance.element = element;


diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html index 8b602867..719f4dbc 100755 --- a/js/document/templates/banner/index.html +++ b/js/document/templates/banner/index.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.
@@ -28,32 +28,32 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31		31
32		32
33	<!--	33	<!--
34	NOTE(s):	34	NOTE(s):
35	All elements in the head of the document to be exclude from I/O	35	All elements in the head of the document to be exclude from I/O
36	must set the 'data-ninja-template'	36	must set the 'data-ninja-template'
37	data-ninja-template="true"	37	data-ninja-template="true"
38	-->	38	-->
39	<html>	39	<html>
40		40
41	<head>	41	<head>
42		42
43	<style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">	43	<style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
44	* {	44	* {
45	-webkit-animation: none !important;	45	-webkit-animation: none !important;
46	-webkit-transition-duration: 0s !important;	46	-webkit-transition-duration: 0s !important;
47	-webkit-animation-duration: 0s !important;	47	-webkit-animation-duration: 0s !important;
48	-webkit-animation-name: none !important;	48	-webkit-animation-name: none !important;
49	-webkit-animation-fill-mode: none !important;	49	-webkit-animation-fill-mode: none !important;
50	}	50	}
51		51
52	body {	52	body {
53	margin: 0;	53	margin: 0;
54	padding: 0;	54	padding: 0;
55	position: absolute;	55	position: absolute;
56	}	56	}
57		57
58	html {	58	html {
59	overflow: scroll;	59	overflow: scroll;
@@ -65,38 +65,38 @@ POSSIBILITY OF SUCH DAMAGE.
65	background: #666;	65	background: #666;
66	}	66	}
67		67
68	.active-element-outline {	68	.active-element-outline {
69	outline: #adff2f solid 2px;	69	outline: #adff2f solid 2px;
70	}	70	}
71		71
72	.nj-preset-transition {	72	.nj-preset-transition {
73	-webkit-transition: all 450ms linear !important;	73	-webkit-transition: all 450ms linear !important;
74	}	74	}
75		75
76	ninjaloadinghack {	76	ninjaloadinghack {
77	display: none;	77	display: none;
78	}	78	}
79		79
80	ninja-viewport, ninja-content {	80	ninja-viewport, ninja-content {
81	display: block;	81	display: block;
82	margin: 0;	82	margin: 0;
83	padding: 0;	83	padding: 0;
84	border: 0;	84	border: 0;
85	position: absolute;	85	position: absolute;
86	overflow: visible;	86	overflow: visible;
87	top: 0;	87	top: 0;
88	left: 0;	88	left: 0;
89	background: transparent;	89	background: transparent;
90	}	90	}
91		91
92	ninja-viewport {	92	ninja-viewport {
93	background: #FFF;	93	background: #FFF;
94	}	94	}
95		95
96	ninja-content {	96	ninja-content {
97	-webkit-transform-style: preserve-3d;	97	-webkit-transform-style: preserve-3d;
98	-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);	98	-webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
99	}	99	}
100		100
101	::-webkit-scrollbar { width: 11px; height: 11px; }	101	::-webkit-scrollbar { width: 11px; height: 11px; }
102	::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; }	102	::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; }
@@ -121,7 +121,7 @@ POSSIBILITY OF SUCH DAMAGE.
121	::-webkit-resizer:disabled { display: block; }	121	::-webkit-resizer:disabled { display: block; }
122		122
123	</style>	123	</style>
124		124
125	<script type="text/javascript" data-ninja-template="true">	125	<script type="text/javascript" data-ninja-template="true">
126		126
127	function getElement(x,y) {	127	function getElement(x,y) {
@@ -144,11 +144,11 @@ POSSIBILITY OF SUCH DAMAGE.
144	set: function() {	144	set: function() {
145	}	145	}
146	});	146	});
147	</script>	147	</script>
148		148
149	<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->	149	<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
150		150
151	<script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>	151	<script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
152		152
153	<script type="text/montage-serialization" data-ninja-template="true">	153	<script type="text/montage-serialization" data-ninja-template="true">
154	{	154	{
@@ -158,18 +158,18 @@ POSSIBILITY OF SUCH DAMAGE.
158	}	158	}
159	</script>	159	</script>
160		160
161	</head>	161	</head>
		162
		163	<body>
		164
		165	<ninjaloadinghack></ninjaloadinghack>
162		166
163	<body>
164
165	<ninjaloadinghack></ninjaloadinghack>
166
167	<ninja-viewport>	167	<ninja-viewport>
168		168
169	<ninja-content></ninja-content>	169	<ninja-content></ninja-content>
170		170
171	</ninja-viewport>	171	</ninja-viewport>
172		172
173	</body>	173	</body>
174		174
175	</html>	175	</html>


diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html index 2677ade6..98ab3506 100755 --- a/js/document/templates/html/index.html +++ b/js/document/templates/html/index.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>