diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c9cd26..ddbe48e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 1.2.15 - 2018-02-12 +### Fixed +- Fix #144 by @Backslider23; memory part doesn't enable OK button correctly. +- Fixed black initialization issue in rgbslider part. + ## 1.2.14 - 2017-12-10 ### Added - PR #143 by @zaeder; `ready` event at end of widget creation. diff --git a/README.md b/README.md index f2dfff1..92b2fdf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ jQuery.colorpicker ================== -Version 1.2.14 +Version 1.2.15 [![License](https://img.shields.io/github/license/vanderlee/colorpicker.svg)]() diff --git a/bower.json b/bower.json index f7ba1d9..ad82613 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "colorpicker", - "version": "1.2.13", + "version": "1.2.15", "homepage": "https://github.com/vanderlee/colorpicker", "authors": [ "Martijn van der Lee " diff --git a/demo.html b/demo.html index 479ce64..873bdb9 100644 --- a/demo.html +++ b/demo.html @@ -164,9 +164,9 @@

Events

$(function() { var count = 0; - function addToEventLog(label, color) { - var line = '
#'+(++count)+' '+label+': '+message+'
'; - var log = $('.cp-events-log'); + function addToEventLog(label, message) { + var line = '
#'+(++count)+' '+label+': '+message+'
', + log = $('.cp-events-log'); log.append(line).scrollTop(log[0].scrollHeight); } diff --git a/jqcolorpicker.jquery.json b/jqcolorpicker.jquery.json index c35454b..2977d01 100644 --- a/jqcolorpicker.jquery.json +++ b/jqcolorpicker.jquery.json @@ -1,6 +1,6 @@ { "name": "jqcolorpicker", - "version": "1.2.13", + "version": "1.2.15", "title": "Vanderlee Colorpicker", "description": "JQuery colorpicker with themeroller styling, RGB, HSL, CMYK and L*A*B support. Standard look & feel, configurable layout. Works as a popup or inline.", "author": { diff --git a/package.json b/package.json index b8d35fa..1fc8ea7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vanderlee-colorpicker", - "version": "1.2.13", + "version": "1.2.15", "homepage": "https://github.com/vanderlee/colorpicker", "author": "Martijn van der Lee ", "repository": { diff --git a/parts/jquery.ui.colorpicker-memory.js b/parts/jquery.ui.colorpicker-memory.js index 5ec2306..b69891e 100644 --- a/parts/jquery.ui.colorpicker-memory.js +++ b/parts/jquery.ui.colorpicker-memory.js @@ -3,7 +3,7 @@ var that = this, container, selectNode = function(node) { - inst._setColor($(node).css('backgroundColor')); + inst.color = inst._parseColor($(node).css('backgroundColor')); inst._change(); }, deleteNode = function(node) { diff --git a/parts/jquery.ui.colorpicker-rgbslider.js b/parts/jquery.ui.colorpicker-rgbslider.js index e5a7439..023a84d 100644 --- a/parts/jquery.ui.colorpicker-rgbslider.js +++ b/parts/jquery.ui.colorpicker-rgbslider.js @@ -22,25 +22,28 @@ g: $('
'), b: $('
') }; + + this.updateGradients = function () { + var color = inst.color.getRGB(); + + setGradient(sliders.r, new $.colorpicker.Color(0, color.g, color.b), new $.colorpicker.Color(1, color.g, color.b)); + setGradient(sliders.g, new $.colorpicker.Color(color.r, 0, color.b), new $.colorpicker.Color(color.r, 1, color.b)); + setGradient(sliders.b, new $.colorpicker.Color(color.r, color.g, 0), new $.colorpicker.Color(color.r, color.g, 1)); + }; this.init = function () { $('
').append(sliders.r, sliders.g, sliders.b) .appendTo($('.ui-colorpicker-rgbslider-container', inst.dialog)); function refresh() { - var min, - max, - r = sliders.r.slider('value') / 255, + var r = sliders.r.slider('value') / 255, g = sliders.g.slider('value') / 255, b = sliders.b.slider('value') / 255; inst.color.setRGB(r, g, b); - - setGradient(sliders.r, new $.colorpicker.Color(0, g, b), new $.colorpicker.Color(1, g, b)); - setGradient(sliders.g, new $.colorpicker.Color(r, 0, b), new $.colorpicker.Color(r, 1, b)); - setGradient(sliders.b, new $.colorpicker.Color(r, g, 0), new $.colorpicker.Color(r, g, 1)); - inst._change(); + + that.updateGradients(); } $(sliders.r).add(sliders.g).add(sliders.b).slider({ @@ -50,6 +53,8 @@ slide: refresh, change: refresh }); + + this.updateGradients(); }; this.repaint = function () {