From 3f992cbb4aa33f94508b9d27e80896a1a902eed0 Mon Sep 17 00:00:00 2001
From: grosbouddha <grosbouddha@gmail.com>
Date: Sun, 20 Sep 2015 02:12:59 +0200
Subject: [PATCH] Applying review comments

---
 src/js/tools/drawing/ColorPicker.js |  4 ++--
 src/js/tools/drawing/Lighten.js     | 11 ++---------
 src/js/tools/drawing/Rectangle.js   |  3 +--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/js/tools/drawing/ColorPicker.js b/src/js/tools/drawing/ColorPicker.js
index 671eac95..62e2238c 100644
--- a/src/js/tools/drawing/ColorPicker.js
+++ b/src/js/tools/drawing/ColorPicker.js
@@ -19,9 +19,9 @@
   ns.ColorPicker.prototype.applyToolAt = function(col, row, frame, overlay, event) {
     if (frame.containsPixel(col, row)) {
       var sampledColor = frame.getPixel(col, row);
-      if (event.button == Constants.LEFT_BUTTON) {
+      if (pskl.app.mouseStateService.isLeftButtonPressed()) {
         $.publish(Events.SELECT_PRIMARY_COLOR, [sampledColor]);
-      } else if (event.button == Constants.RIGHT_BUTTON) {
+      } else if (pskl.app.mouseStateService.isRightButtonPressed()) {
         $.publish(Events.SELECT_SECONDARY_COLOR, [sampledColor]);
       }
     }
diff --git a/src/js/tools/drawing/Lighten.js b/src/js/tools/drawing/Lighten.js
index efbba94f..3e90dc80 100644
--- a/src/js/tools/drawing/Lighten.js
+++ b/src/js/tools/drawing/Lighten.js
@@ -69,16 +69,9 @@
         color = window.tinycolor.lighten(pixelColor, step);
       }
     }
-    if (color) {
-      // Convert tinycolor color to string format.
-      color = color.toRgbString();
-    } else {
-      // Not sure why this check exists in the first place.
-      // Fallback to the always defined SimplePen tool color in this case.
-      color = this.getToolColor();
-    }
     usedPixels[key] = true;
 
-    return color;
+    // Convert tinycolor color to string format.
+    return color.toRgbString();
   };
 })();
diff --git a/src/js/tools/drawing/Rectangle.js b/src/js/tools/drawing/Rectangle.js
index 4f4d64fb..80b9c2e0 100644
--- a/src/js/tools/drawing/Rectangle.js
+++ b/src/js/tools/drawing/Rectangle.js
@@ -10,7 +10,6 @@
     ns.ShapeTool.call(this);
 
     this.toolId = 'tool-rectangle';
-
     this.helpText = 'Rectangle tool';
   };
 
@@ -23,7 +22,7 @@
     var strokePoints = pskl.PixelUtils.getBoundRectanglePixels(this.startCol, this.startRow, col, row);
     for (var i = 0 ; i < strokePoints.length ; i++) {
       // Change model:
-      targetFrame.setPixel(strokePoints[i].col, strokePoints[i].row, this.getToolColor());
+      targetFrame.setPixel(strokePoints[i].col, strokePoints[i].row, color);
     }
   };
 })();