Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

author: hwc487 2012-05-01 11:03:56 -0700
committer: hwc487 2012-05-01 11:03:56 -0700
commit: f6983a69649b1c274ce6fe2d278a325994d092b6 (patch)
tree: a360297930c35f3097af16e9f6714ec501bd5894 /js/document
parent: 80715f4f0c45d29926184fa02e0a01b4e7642a79 (diff)
parent: fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff)
download: ninja-f6983a69649b1c274ce6fe2d278a325994d092b6.tar.gz
3 files changed, 19 insertions, 20 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 3dbf96ce..9d083dd8 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -207,16 +207,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                        var elt = this.documentRoot;
                        if (elt)
                        {
+                                /*
+                                // Use this code to test the runtime version of WebGL
+                                var cdm = new NinjaCvsRt.CanvasDataManager();
+                                cdm.loadGLData(elt,  value,  null );
+                                */
+                                // /*
                                var nWorlds= value.length;
                                for (var i=0;  i<nWorlds;  i++)
                                {
-                                        /*
-                                        // Use this code to test the runtime version of WebGL
-                                        var cdm = new NinjaCvsRt.CanvasDataManager();
-                                        cdm.loadGLData(elt,  value,  null );
-                                        */
-                                        // /*
                                        // get the data for the next canvas
                                        var importStr = value[i];
@@ -228,7 +228,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                        {
                                                // JSON format.  pull off the
                                                importStr = importStr.substr( index+1 );
-                                                jObj = jObj = JSON.parse( importStr );
+                                                jObj = JSON.parse( importStr );
                                                id = jObj.id;
                                        }
                                        else
@@ -281,8 +281,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                        }
                                                }
                                        }
-                                        // */
                                }
+                                // */
                        }
                }
    },
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
index 08e39f22..e62a20a9 100755
--- a/js/document/templates/montage-web/default_html.css
+++ b/js/document/templates/montage-web/default_html.css
@@ -10,6 +10,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
    -webkit-animation-name: none !important;
 }
+body {
+    margin: 0;
+    padding: 0;
+    position: absolute;
+    -webkit-transform-style: preserve-3d;
+    -webkit-perspective: 1400px;
+}
 .active-element-outline {
    outline: #adff2f solid 2px;
 }
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 630794a4..caebc8d0 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -29,20 +29,10 @@
        }
        </script>
-        <style>
-            div {
-                width: 4000px;
-                height: 300px;
-                background: red;
-            }
-        </style>
        </head>
        <body>
-                
+        <style></style>
-                <!--<div>IPSUM</div>-->
        </body>
 </html>
 \ No newline at end of file
author	hwc487	2012-05-01 11:03:56 -0700
committer	hwc487	2012-05-01 11:03:56 -0700
commit	f6983a69649b1c274ce6fe2d278a325994d092b6 (patch)
tree	a360297930c35f3097af16e9f6714ec501bd5894 /js/document
parent	80715f4f0c45d29926184fa02e0a01b4e7642a79 (diff)
parent	fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff)
download	ninja-f6983a69649b1c274ce6fe2d278a325994d092b6.tar.gz

diff --git a/js/document/html-document.js b/js/document/html-document.js index 3dbf96ce..9d083dd8 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js
@@ -207,16 +207,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
207	var elt = this.documentRoot;	207	var elt = this.documentRoot;
208	if (elt)	208	if (elt)
209	{	209	{
		210	/*
		211	// Use this code to test the runtime version of WebGL
		212	var cdm = new NinjaCvsRt.CanvasDataManager();
		213	cdm.loadGLData(elt, value, null );
		214	*/
		215
		216	// /*
210	var nWorlds= value.length;	217	var nWorlds= value.length;
211	for (var i=0; i<nWorlds; i++)	218	for (var i=0; i<nWorlds; i++)
212	{	219	{
213	/*
214	// Use this code to test the runtime version of WebGL
215	var cdm = new NinjaCvsRt.CanvasDataManager();
216	cdm.loadGLData(elt, value, null );
217	*/
218
219	// /*
220	// get the data for the next canvas	220	// get the data for the next canvas
221	var importStr = value[i];	221	var importStr = value[i];
222		222
@@ -228,7 +228,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
228	{	228	{
229	// JSON format. pull off the	229	// JSON format. pull off the
230	importStr = importStr.substr( index+1 );	230	importStr = importStr.substr( index+1 );
231	jObj = jObj = JSON.parse( importStr );	231	jObj = JSON.parse( importStr );
232	id = jObj.id;	232	id = jObj.id;
233	}	233	}
234	else	234	else
@@ -281,8 +281,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
281	}	281	}
282	}	282	}
283	}	283	}
284	// */
285	}	284	}
		285	// */
286	}	286	}
287	}	287	}
288	},	288	},


diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css index 08e39f22..e62a20a9 100755 --- a/js/document/templates/montage-web/default_html.css +++ b/js/document/templates/montage-web/default_html.css
@@ -10,6 +10,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
10	-webkit-animation-name: none !important;	10	-webkit-animation-name: none !important;
11	}	11	}
12		12
		13	body {
		14	margin: 0;
		15	padding: 0;
		16
		17	position: absolute;
		18	-webkit-transform-style: preserve-3d;
		19	-webkit-perspective: 1400px;
		20	}
		21
13	.active-element-outline {	22	.active-element-outline {
14	outline: #adff2f solid 2px;	23	outline: #adff2f solid 2px;
15	}	24	}


diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index 630794a4..caebc8d0 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html
@@ -29,20 +29,10 @@
29	}	29	}
30	</script>	30	</script>
31		31
32	<style>
33	div {
34	width: 4000px;
35	height: 300px;
36	background: red;
37	}
38	</style>
39
40	</head>	32	</head>
41		33
42	<body>	34	<body>
43		35	<style></style>
44	<!--<div>IPSUM</div>-->
45
46	</body>	36	</body>
47		37
48	</html> \ No newline at end of file	38	</html> \ No newline at end of file