From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs

---
 js/tools/LineTool.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'js/tools/LineTool.js')

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 89f33a16..b0681af7 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -28,23 +28,23 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var Montage = 	require("montage/core/core").Montage,
+var Montage =   require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
     DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase,
     NJUtils = require("js/lib/NJUtils").NJUtils,
     TagTool = require("js/tools/TagTool").TagTool,
-    ShapesController = 	require("js/controllers/elements/shapes-controller").ShapesController,
+    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController,
     ShapeModel = require("js/models/shape-model").ShapeModel;
 
 var Line = require("js/lib/geom/line").Line;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 exports.LineTool = Montage.create(ShapeTool, {
-	_toolID: { value: "lineTool" },
-	_imageID: { value: "lineToolImg" },
-	_toolImageClass: { value: "lineToolUp" },
-	_selectedToolImageClass: { value: "lineToolDown" },
-	_toolTipText: { value: "Line Tool (L)" },
+    _toolID: { value: "lineTool" },
+    _imageID: { value: "lineToolImg" },
+    _toolImageClass: { value: "lineToolUp" },
+    _selectedToolImageClass: { value: "lineToolDown" },
+    _toolTipText: { value: "Line Tool (L)" },
 
     _tmpDrawIndex : { value : 1, writable:true},
 
@@ -174,9 +174,9 @@ exports.LineTool = Montage.create(ShapeTool, {
                 dx,
                 dy;
             
-			if (hitRec0 && hitRec1) {
-				var p0 = hitRec0.getLocalPoint(),
-					p1 = hitRec1.getLocalPoint();
+            if (hitRec0 && hitRec1) {
+                var p0 = hitRec0.getLocalPoint(),
+                    p1 = hitRec1.getLocalPoint();
 
                 dx = Math.floor(p0[0] - p1[0]);
                 dy = Math.floor(p0[1] - p1[1]);
@@ -246,7 +246,7 @@ exports.LineTool = Montage.create(ShapeTool, {
     },
 
     RenderShape: {
-		value: function (w, h, planeMat, midPt, canvas, slope, xAdj, yAdj)
+        value: function (w, h, planeMat, midPt, canvas, slope, xAdj, yAdj)
         {
 
             var strokeStyleIndex = this.options.strokeStyleIndex;
@@ -268,7 +268,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-				strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
-- 
cgit v1.2.3


From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:53:10 -0700
Subject: Remove trailing spaces

---
 js/tools/LineTool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/tools/LineTool.js')

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index b0681af7..2dbaf593 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -173,7 +173,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 slope,
                 dx,
                 dy;
-            
+
             if (hitRec0 && hitRec1) {
                 var p0 = hitRec0.getLocalPoint(),
                     p1 = hitRec1.getLocalPoint();
-- 
cgit v1.2.3


From ac27d538af33ca8d67d3d88729f49c05793afda7 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 9 Jul 2012 11:43:36 -0700
Subject: PI, drawing and editing fixes for shapes and materials.

IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color.

IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material.

IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat.

IKNINJA-1886 - Gradient edits not applied to WebGL Stage object.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/tools/LineTool.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'js/tools/LineTool.js')

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 413c0302..f9f2f817 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -244,7 +244,11 @@ exports.LineTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-				strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
+                    strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
+                } else {
+                    strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                }
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
-- 
cgit v1.2.3