diff options
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-x | js/document/html-document.js | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 5538229c..93720f0f 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 | } |
@@ -436,7 +429,6 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
436 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) | 429 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) |
437 | { | 430 | { |
438 | var data = elt.elementModel.shapeModel.GLWorld.exportJSON(); | 431 | var data = elt.elementModel.shapeModel.GLWorld.exportJSON(); |
439 | //var data = elt.elementModel.shapeModel.GLWorld.export(); | ||
440 | dataArray.push( data ); | 432 | dataArray.push( data ); |
441 | } | 433 | } |
442 | 434 | ||
@@ -881,11 +873,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
881 | //TODO: Add logic to handle save before preview | 873 | //TODO: Add logic to handle save before preview |
882 | this.application.ninja.documentController.handleExecuteSaveAll(null); | 874 | this.application.ninja.documentController.handleExecuteSaveAll(null); |
883 | //Temp check for webGL Hack | 875 | //Temp check for webGL Hack |
884 | if (this.application.ninja.documentController.activeDocument.glData.length && this.application.ninja.documentController.activeDocument.glData.length > 1) {//TODO: Should be 0, temp hack fix | 876 | window.open(this.application.ninja.coreIoApi.rootUrl + this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]); |
885 | 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); | ||
886 | } else { | ||
887 | window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]); | ||
888 | } | ||
889 | //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]}); | 877 | //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]}); |
890 | } | 878 | } |
891 | }, | 879 | }, |