From 5b4f6b1618cf571a6bce5a631f976a008e04a64e Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 29 Mar 2012 15:52:08 -0700 Subject: Updated shapes to always check for its stroke and fill colors and materials instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari --- js/document/html-document.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'js/document') diff --git a/js/document/html-document.js b/js/document/html-document.js index 8f9d2870..6ca9eaa3 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js @@ -307,19 +307,15 @@ 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.stroke = root._strokeColor; 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.fill = root._fillColor; shapeModel.tlRadius = root._tlRadius; shapeModel.trRadius = root._trRadius; shapeModel.blRadius = root._blRadius; @@ -329,8 +325,7 @@ 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.fill = root._fillColor; shapeModel.innerRadius = root._innerRadius; break; -- cgit v1.2.3 From 4d132fcbde4540c2cac6c0df613940353e2690f6 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 3 Apr 2012 12:03:16 -0700 Subject: Give user feedback about which element the Fill/InkBottle tools will act on. Signed-off-by: Nivesh Rajbhandari --- js/document/templates/montage-html/default_html.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/document') diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css index 6c2b415f..424c5801 100755 --- a/js/document/templates/montage-html/default_html.css +++ b/js/document/templates/montage-html/default_html.css @@ -70,8 +70,8 @@ body -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 { -- cgit v1.2.3