aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-xjs/document/html-document.js24
1 files changed, 2 insertions, 22 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 42a7d537..2531465d 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -212,7 +212,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
212 { 212 {
213 /* 213 /*
214 // Use this code to test the runtime version of WebGL 214 // Use this code to test the runtime version of WebGL
215 var cdm = new CanvasDataManager(); 215 var cdm = new NinjaCvsRt.CanvasDataManager();
216 cdm.loadGLData(elt, value, null ); 216 cdm.loadGLData(elt, value, null );
217 */ 217 */
218 218
@@ -276,13 +276,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
276 var world = new GLWorld( canvas, useWebGL ); 276 var world = new GLWorld( canvas, useWebGL );
277 world.importJSON( jObj ); 277 world.importJSON( jObj );
278 } 278 }
279 else
280 {
281 var index = importStr.indexOf( "webGL: " );
282 var useWebGL = (index >= 0);
283 var world = new GLWorld( canvas, useWebGL );
284 world.import( importStr );
285 }
286 279
287 this.buildShapeModel( canvas.elementModel, world ); 280 this.buildShapeModel( canvas.elementModel, world );
288 } 281 }
@@ -307,19 +300,13 @@ exports.HTMLDocument = Montage.create(TextDocument, {
307 { 300 {
308 shapeModel.GLGeomObj = root; 301 shapeModel.GLGeomObj = root;
309 shapeModel.strokeSize = root._strokeWidth; 302 shapeModel.strokeSize = root._strokeWidth;
310 shapeModel.stroke = root._strokeColor.slice();
311 shapeModel.strokeMaterial = root._strikeMaterial ? root._strokeMaterial.dup() : null;
312 shapeModel.strokeStyle = "solid"; 303 shapeModel.strokeStyle = "solid";
313 //shapeModel.strokeStyleIndex 304 //shapeModel.strokeStyleIndex
314 //shapeModel.border
315 //shapeModel.background
316 switch (root.geomType()) 305 switch (root.geomType())
317 { 306 {
318 case root.GEOM_TYPE_RECTANGLE: 307 case root.GEOM_TYPE_RECTANGLE:
319 elementModel.selection = "Rectangle"; 308 elementModel.selection = "Rectangle";
320 elementModel.pi = "RectanglePi"; 309 elementModel.pi = "RectanglePi";
321 shapeModel.fill = root._fillColor.slice();
322 shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null;
323 shapeModel.tlRadius = root._tlRadius; 310 shapeModel.tlRadius = root._tlRadius;
324 shapeModel.trRadius = root._trRadius; 311 shapeModel.trRadius = root._trRadius;
325 shapeModel.blRadius = root._blRadius; 312 shapeModel.blRadius = root._blRadius;
@@ -329,8 +316,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
329 case root.GEOM_TYPE_CIRCLE: 316 case root.GEOM_TYPE_CIRCLE:
330 elementModel.selection = "Oval"; 317 elementModel.selection = "Oval";
331 elementModel.pi = "OvalPi"; 318 elementModel.pi = "OvalPi";
332 shapeModel.fill = root._fillColor.slice();
333 shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null;
334 shapeModel.innerRadius = root._innerRadius; 319 shapeModel.innerRadius = root._innerRadius;
335 break; 320 break;
336 321
@@ -432,7 +417,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
432 if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) 417 if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
433 { 418 {
434 var data = elt.elementModel.shapeModel.GLWorld.exportJSON(); 419 var data = elt.elementModel.shapeModel.GLWorld.exportJSON();
435 //var data = elt.elementModel.shapeModel.GLWorld.export();
436 dataArray.push( data ); 420 dataArray.push( data );
437 } 421 }
438 422
@@ -877,11 +861,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
877 //TODO: Add logic to handle save before preview 861 //TODO: Add logic to handle save before preview
878 this.application.ninja.documentController.handleExecuteSaveAll(null); 862 this.application.ninja.documentController.handleExecuteSaveAll(null);
879 //Temp check for webGL Hack 863 //Temp check for webGL Hack
880 if (this.application.ninja.documentController.activeDocument.glData.length && this.application.ninja.documentController.activeDocument.glData.length > 1) {//TODO: Should be 0, temp hack fix 864 window.open(this.application.ninja.coreIoApi.rootUrl + this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
881 setTimeout(function () {window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);}.bind(this), 3500);
882 } else {
883 window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
884 }
885 //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]}); 865 //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});
886 } 866 }
887 }, 867 },