Skip to content

Commit

Permalink
upgrade to newer colourpicker JS lib to fix bugs in newer jquery
Browse files Browse the repository at this point in the history
  • Loading branch information
daattali committed Aug 16, 2016
1 parent 7b93568 commit be4071c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
9 changes: 5 additions & 4 deletions inst/www/shared/colourpicker/js/colourpicker.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
/*
/**
* jQuery Colour picker: A tiny colour picker with useful extra features
*
* Copyright:
* Dean Attali, http://deanattali.com
* Cory LaViska for A Beautiful Site, LLC: http://www.abeautifulsite.net/
*
* Version: 1.1
*
* Contribute: https://github.com/daattali/jquery-colourpicker
*
* @license: http://opensource.org/licenses/MIT
*
*/
(function (factory) {
/* jshint ignore:start */
Expand Down Expand Up @@ -429,7 +430,7 @@
// Update select colour
if( settings.palette == 'limited') {
colourpicker.find('.cp-list-col').removeClass('selected-col');
colourpicker.find('.cp-list-col[data-cp-col=' + hex + ']')
colourpicker.find('.cp-list-col[data-cp-col="' + hex + '"]')
.addClass('selected-col')
.addClass(isColDark(hex) ? 'dark' : 'light');
}
Expand Down Expand Up @@ -486,7 +487,7 @@
// Update select colour
if( settings.palette == 'limited') {
colourpicker.find('.cp-list-col').removeClass('selected-col');
colourpicker.find('.cp-list-col[data-cp-col=' + hex + ']')
colourpicker.find('.cp-list-col[data-cp-col="' + hex + '"]')
.addClass('selected-col')
.addClass(isColDark(hex) ? 'dark' : 'light');
}
Expand Down
Loading

0 comments on commit be4071c

Please sign in to comment.