Merge branch 'refs/heads/Ninja-Internal' into FileIO

4 files changed, 3 insertions, 20 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index e96c9943..2531465d 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -300,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;
@@ -322,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;
 
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 6c2b415f..04b21c6f 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -65,13 +65,8 @@ 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);
-}
-
-.elem-red-outline {
-  outline: red solid thin;
+.active-element-outline {
+  outline: #adff2f solid 2px;
 }
 
 .nj-preset-transition {
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 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, {
     needsSave: {
         get: function() { return this._needsSave; },
         set: function(value) {
-            var i=0, canSaveAll=false;
             this._needsSave = value;
-
-            this.application.ninja.documentController.canSave = value;//for save menu state update
-            this.application.ninja.documentController.canSaveAll = value;//for save menu state update..currently save all is tried to the current document only
         }
     },