summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/lib
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-13 13:03:20 -0500
committerJules Laplace <jules@okfoc.us>2014-11-13 13:03:20 -0500
commit0f8be5bc39ca5049d3f29fe74eb423da4dcb055a (patch)
treecc0ca9ef6810dda2a6507e50db57697c2c548e72 /public/assets/javascripts/ui/lib
parent596dc1d15fab2f883f79f0037d5fec57e59ff1de (diff)
text color picker
Diffstat (limited to 'public/assets/javascripts/ui/lib')
-rw-r--r--public/assets/javascripts/ui/lib/LabColorPicker.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/lib/LabColorPicker.js b/public/assets/javascripts/ui/lib/LabColorPicker.js
index 0e1563a..7ddcdd5 100644
--- a/public/assets/javascripts/ui/lib/LabColorPicker.js
+++ b/public/assets/javascripts/ui/lib/LabColorPicker.js
@@ -64,7 +64,7 @@ var LabColorPicker = function (parent, w, h) {
var y = mix( j/hh, b_range[0], b_range[1] )
var rgb = xyz2rgb(hunterlab2xyz(val, x, y)).map(Math.round)
this.moveCursor(i, j)
- parent.pick( rgb, [val,x,y] )
+ parent.pickColor( rgb, [val,x,y] )
}
this.load = function(rgba){
var Lab = xyz2hunterlab(rgb2xyz(rgba))
@@ -107,7 +107,7 @@ var LabColorPicker = function (parent, w, h) {
this.updateBrightness = function(){
parent.labColor[0] = parseFloat( $brightnessControl.val() )
var rgb = base.setLab( parent.labColor )
- parent.pick(rgb, parent.labColor)
+ parent.pickColor(rgb, parent.labColor)
}
this.setBrightness = function(Lab){
$brightnessControl.val(Lab[0])