diff options
| author | ryderr <r@okfoc.us> | 2014-09-29 18:56:40 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-09-29 18:56:40 -0400 |
| commit | 55c14cb5cdc2e3a4b693816cc60dd1c2433b0ff2 (patch) | |
| tree | 8700688667904ae49888b12e0a190770ee9237bd /public/assets/javascripts/ui/editor/LightControl.js | |
| parent | 24614e0764ec4655ded8b66ba6832bf8cd3cda1d (diff) | |
| parent | dea374c2a0721a394ae5f041e8e324df4b5eb375 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor/LightControl.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/LightControl.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js index 9c3cdd3..3eb2861 100644 --- a/public/assets/javascripts/ui/editor/LightControl.js +++ b/public/assets/javascripts/ui/editor/LightControl.js @@ -175,10 +175,12 @@ var LabColorPicker = function (parent, w, h) { return rgb } this.pick = function(i, j){ + i = clamp(i, 0, w) + j = clamp(j, 0, h) var x = mix( i/ww, a_range[0], a_range[1] ) var y = mix( j/hh, b_range[0], b_range[1] ) var rgb = xyz2rgb(hunterlab2xyz(val, x, y)).map(Math.round) - this.moveCursor(x,y) + this.moveCursor(i, j) parent.pick( rgb, [val,x,y] ) } this.load = function(rgba){ |