aboutsummaryrefslogtreecommitdiff
path: root/js/tools/EyedropperTool.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/tools/EyedropperTool.js')
-rwxr-xr-xjs/tools/EyedropperTool.js26
1 files changed, 11 insertions, 15 deletions
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 3d0799e0..1d97d11b 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -95,22 +95,19 @@ exports.EyedropperTool = Montage.create(toolBase, {
95 }, 95 },
96 96
97 HandleLeftButtonUp: { 97 HandleLeftButtonUp: {
98 value : function (event) { 98 value: function(event) {
99 { 99 this._isMouseDown = false;
100 this._isMouseDown = false;
101 100
102 if(this._escape) 101 if(this._escape) {
103 { 102 this._escape = false;
104 this._escape = false; 103 }
105 }
106 104
107 this._updateColor(this._color, true); 105 this._updateColor(this._color, true);
108 106
109 this._color = null; 107 this._color = null;
110 108
111 this._elementUnderMouse = null; 109 this._elementUnderMouse = null;
112 this._deleteImageDataCanvas(); 110 this._deleteImageDataCanvas();
113 }
114 } 111 }
115 }, 112 },
116 113
@@ -237,8 +234,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
237 234
238 if(color.mode === "gradient") 235 if(color.mode === "gradient")
239 { 236 {
240 this.application.ninja.colorController.colorModel["gradient"] = 237 this.application.ninja.colorController.colorModel.gradient = {value: color.color, wasSetByCode: true, type: eventType};
241 {value: color.color, wasSetByCode: true, type: eventType};
242 } 238 }
243 else 239 else
244 { 240 {
@@ -253,7 +249,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
253 } 249 }
254 else 250 else
255 { 251 {
256 this.application.ninja.colorController.colorModel["rgb"] = color.color; 252 this.application.ninja.colorController.colorModel.rgb = color.color;
257 } 253 }
258 } 254 }
259 255