aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorEric Guzman2012-05-01 11:16:22 -0700
committerEric Guzman2012-05-01 11:16:22 -0700
commit0ad52cd1ba6987446b9959e399c5ad14b8c631ee (patch)
tree2d8198be86b3d3e7e812f3f3175c27ba2993fb5b /js/document
parent9a94c6fb5f82d18139b48341788a0ffca23ae0af (diff)
parentfb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff)
downloadninja-0ad52cd1ba6987446b9959e399c5ad14b8c631ee.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js18
-rwxr-xr-xjs/document/templates/montage-web/default_html.css9
-rwxr-xr-xjs/document/templates/montage-web/index.html12
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, {
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
13body {
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