aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-06 12:13:59 -0700
committerPushkar Joshi2012-04-06 12:13:59 -0700
commit6cce5e9367676f5b452c28dd7d960aa46f4e464c (patch)
tree779125b7c1fc668c02e0dfbb661494a16242c329 /js/document
parentf61545fd7054088efc88aafffd78e11df80d750d (diff)
parent7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff)
downloadninja-6cce5e9367676f5b452c28dd7d960aa46f4e464c.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js16
-rwxr-xr-xjs/document/text-document.js4
2 files changed, 2 insertions, 18 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 },
diff --git a/js/document/text-document.js b/js/document/text-document.js
index 54a53999..2574b67c 100755
--- a/js/document/text-document.js
+++ b/js/document/text-document.js
@@ -164,11 +164,7 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
164 needsSave: { 164 needsSave: {
165 get: function() { return this._needsSave; }, 165 get: function() { return this._needsSave; },
166 set: function(value) { 166 set: function(value) {
167 var i=0, canSaveAll=false;
168 this._needsSave = value; 167 this._needsSave = value;
169
170 this.application.ninja.documentController.canSave = value;//for save menu state update
171 this.application.ninja.documentController.canSaveAll = value;//for save menu state update..currently save all is tried to the current document only
172 } 168 }
173 }, 169 },
174 170