New upstream version 1.2.16

CHANGELOG.md

@@ -4,6 +4,15 @@ 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.16 - 2018-02-19
+### Fixed
+- Merged PR #145 by @gentoo90; accept numpad keys on hex inputs.
+
+## 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.

README.md

 jQuery.colorpicker
 ==================
-Version 1.2.14
+Version 1.2.16
 
 [![License](https://img.shields.io/github/license/vanderlee/colorpicker.svg)]()
 
-Copyright © 2011-2017 Martijn W. van der Lee.
+Copyright © 2011-2018 Martijn W. van der Lee.
 Licensed under the MIT.
 
 Full-featured colorpicker for jQueryUI with full theming support.

bower.json

 {
   "name": "colorpicker",
-  "version": "1.2.13",
+  "version": "1.2.16",
   "homepage": "https://github.com/vanderlee/colorpicker",
   "authors": [
     "Martijn van der Lee <martijn@vanderlee.com>"

demo.html

@@ -164,9 +164,9 @@
 					$(function() {
 						var count = 0;
 
-						function addToEventLog(label, color) {
-							var line = '<div>#'+(++count)+' '+label+': '+message+'</div>';
-							var log = $('.cp-events-log');
+						function addToEventLog(label, message) {
+							var line = '<div>#'+(++count)+' '+label+': '+message+'</div>',
+								log = $('.cp-events-log');
 							log.append(line).scrollTop(log[0].scrollHeight);
 						}
 

jqcolorpicker.jquery.json

 {
 	"name": "jqcolorpicker",
-	"version": "1.2.13",
+	"version": "1.2.16",
 	"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": {

jquery.colorpicker.js

@@ -51,6 +51,7 @@
 			},			
 			isHex: function(keycode) {
 				return (keycode >= 48 && keycode <= 57)		// number keys
+					|| (keycode >= 96 && keycode <= 105)	// numpad keys
 					|| (keycode >= 65 && keycode <= 70);	// a-f
 			}
 		},

package.json

 {
   "name": "vanderlee-colorpicker",
-  "version": "1.2.13",
+  "version": "1.2.16",
   "homepage": "https://github.com/vanderlee/colorpicker",
   "author": "Martijn van der Lee <martijn@vanderlee.com>",
   "repository": {

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) {

parts/jquery.ui.colorpicker-rgbslider.js

@@ -22,25 +22,28 @@
 						g: $('<div class="ui-colorpicker-slider"/>'),
 						b: $('<div class="ui-colorpicker-slider"/>')
 					};
+					
+		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 () {
 			$('<div class="ui-colorpicker-rgbslider"/>').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 () {