aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-04 15:58:49 -0700
committerValerio Virgillito2012-04-04 15:58:49 -0700
commit347b4179be5581841fc94825dcb18901e625c670 (patch)
tree93556d56b049aa47c615a8b58add230cd96da166 /js/document
parent9f1806a7134ec4744a8009e6a7467f5cea04cabf (diff)
parente721a7c1009f298a1bd8fea583da14535e039880 (diff)
downloadninja-347b4179be5581841fc94825dcb18901e625c670.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js16
1 files changed, 2 insertions, 14 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 42a7d537..e96c9943 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 }
@@ -432,7 +425,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
432 if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) 425 if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
433 { 426 {
434 var data = elt.elementModel.shapeModel.GLWorld.exportJSON(); 427 var data = elt.elementModel.shapeModel.GLWorld.exportJSON();
435 //var data = elt.elementModel.shapeModel.GLWorld.export();
436 dataArray.push( data ); 428 dataArray.push( data );
437 } 429 }
438 430
@@ -877,11 +869,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
877 //TODO: Add logic to handle save before preview 869 //TODO: Add logic to handle save before preview
878 this.application.ninja.documentController.handleExecuteSaveAll(null); 870 this.application.ninja.documentController.handleExecuteSaveAll(null);
879 //Temp check for webGL Hack 871 //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 872 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]}); 873 //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});
886 } 874 }
887 }, 875 },