4 files changed, 16 insertions, 29 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 8f9d2870..2531465d 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -212,7 +212,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 {
                                         /*
                                         // Use this code to test the runtime version of WebGL
-                                        var cdm = new CanvasDataManager();
+                                        var cdm = new NinjaCvsRt.CanvasDataManager();
                                         cdm.loadGLData(elt,  value,  null );
                                         */
 
@@ -276,13 +276,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                         var world = new GLWorld( canvas, useWebGL );
                                                                         world.importJSON( jObj );
                                                                 }
-                                                                else
-                                                                {
-                                                                        var index = importStr.indexOf( "webGL: " );
-                                                                        var useWebGL = (index >= 0);
-                                                                        var world = new GLWorld( canvas, useWebGL );
-                                                                        world.import( importStr );
-                                                                }
 
                                                                 this.buildShapeModel( canvas.elementModel, world );
                                                         }
@@ -307,19 +300,13 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         {
                                 shapeModel.GLGeomObj                    = root;
                                 shapeModel.strokeSize                   = root._strokeWidth;
-                                shapeModel.stroke                               = root._strokeColor.slice();
-                                shapeModel.strokeMaterial               = root._strikeMaterial ? root._strokeMaterial.dup() : null;
                                 shapeModel.strokeStyle                  = "solid";
                                 //shapeModel.strokeStyleIndex
-                                //shapeModel.border
-                                //shapeModel.background
                                 switch (root.geomType())
                                 {
                                         case root.GEOM_TYPE_RECTANGLE:
                         elementModel.selection = "Rectangle";
                         elementModel.pi = "RectanglePi";
-                        shapeModel.fill                                 = root._fillColor.slice();
-                        shapeModel.fillMaterial                 = root._fillMaterial ? root._fillMaterial.dup() : null;
                                                 shapeModel.tlRadius = root._tlRadius;
                                                 shapeModel.trRadius = root._trRadius;
                                                 shapeModel.blRadius = root._blRadius;
@@ -329,8 +316,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                         case root.GEOM_TYPE_CIRCLE:
                         elementModel.selection = "Oval";
                         elementModel.pi = "OvalPi";
-                        shapeModel.fill                                 = root._fillColor.slice();
-                        shapeModel.fillMaterial                 = root._fillMaterial ? root._fillMaterial.dup() : null;
                                                 shapeModel.innerRadius = root._innerRadius;
                                                 break;
 
@@ -340,6 +325,12 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                 shapeModel.slope = root._slope;
                                                 break;
 
+                    case root.GEOM_TYPE_BRUSH_STROKE:
+                        elementModel.selection = "BrushStroke";
+                        elementModel.pi = "BrushStrokePi";
+                                                break;
+
+
                                         default:
                                                 console.log( "geometry type not supported for file I/O, " + root.geomType());
                                                 break;
@@ -426,7 +417,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
                         {
                                 var data = elt.elementModel.shapeModel.GLWorld.exportJSON();
-                                //var data = elt.elementModel.shapeModel.GLWorld.export();
                                 dataArray.push( data );
                         }
 
@@ -871,11 +861,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 //TODO: Add logic to handle save before preview
                 this.application.ninja.documentController.handleExecuteSaveAll(null);
                 //Temp check for webGL Hack
-                if (this.application.ninja.documentController.activeDocument.glData.length && this.application.ninja.documentController.activeDocument.glData.length > 1) {//TODO: Should be 0, temp hack fix
-                        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);
-                } else {
-                        window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
-                }
+                window.open(this.application.ninja.coreIoApi.rootUrl + this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
                 //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});          
         }
     },
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 68300edf..04b21c6f 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -65,11 +65,10 @@ body
         display: none;
 }
 
-.global3DSettings {
-  -webkit-transform-style: preserve-3d;
-  -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+.active-element-outline {
+  outline: #adff2f solid 2px;
 }
 
-.elem-red-outline {
-  outline: red solid thin;
+.nj-preset-transition {
+    -webkit-transition: all 450ms linear !important;
 }
\ No newline at end of file
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
index edfab2b0..b3f68030 100755
--- a/js/document/templates/montage-html/index.html
+++ b/js/document/templates/montage-html/index.html
@@ -40,7 +40,7 @@
                 
                 <ninja-div id="Viewport" class="stageDimension">
                         
-                        <ninja-div id="UserContent" class="stageView stageDimension global3DSettings"></ninja-div>
+                        <ninja-div id="UserContent" class="stageView stageDimension"></ninja-div>
                         
                 </ninja-div>
 
diff --git a/js/document/text-document.js b/js/document/text-document.js
index 88464d87..2574b67c 100755
--- a/js/document/text-document.js
+++ b/js/document/text-document.js
@@ -163,7 +163,9 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
 
     needsSave: {
         get: function() { return this._needsSave; },
-        set: function(value) { this._needsSave = value }
+        set: function(value) {
+            this._needsSave = value;
+        }
     },
 
     callback: {