From 0a2e2217c9724ed4f174203a9780a50663c823c6 Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Thu, 6 Sep 2012 23:10:02 +0200 Subject: [PATCH] Fixed regression on color-picker --- js/Palette.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/Palette.js b/js/Palette.js index e0ff02a8..07afa45e 100644 --- a/js/Palette.js +++ b/js/Palette.js @@ -53,10 +53,10 @@ pskl.Palette = (function() { var onPaletteColorClick_ = function (event) { var selectedColor = $(event.target).data("color"); if (event.which == 1) { // left button - updateColorPicker(selectedColor, $('#color-picker')[0]); + updateColorPicker(selectedColor, $('#color-picker')); $.publish(Events.COLOR_SELECTED, [selectedColor, true]); } else if (event.which == 3) { // right button - updateColorPicker(selectedColor, $('#secondary-color-picker')[0]); + updateColorPicker(selectedColor, $('#secondary-color-picker')); $.publish(Events.COLOR_SELECTED, [selectedColor, false]); } }; @@ -72,10 +72,10 @@ pskl.Palette = (function() { // The colorpicker can't be set to a transparent state. // We set its background to white and insert the // string "TRANSPARENT" to mimic this state: - colorPicker.color.fromString("#fff"); + colorPicker[0].color.fromString("#fff"); colorPicker.val(Constants.TRANSPARENT_COLOR); } else { - colorPicker.color.fromString(color); + colorPicker[0].color.fromString(color); } }