From 68a573623101fe718e46eee99c4dd64fae669448 Mon Sep 17 00:00:00 2001 From: cedoor Date: Wed, 13 Apr 2016 12:41:44 +0200 Subject: [PATCH] fix boolean values for the events of the closing/opening --- README.md | 10 ++++++---- jqColorPicker.js | 10 +++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8ea1b12..a44ab81 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ $('.color').colorPicker({ GPU: true, // use transform: translate3d doRender: true | 'selector', // manipulate color and bgColor of input field (on certain elements if selector) opacity: true, // enable / disable alpha slider - renderCallback: function($elm, toggled) {}, // this === instance; $elm: the input field;toggle === true -> just appeared; false -> opposite; else -> is rendering on pointer move - // toggled true/false can for example be used to check if the $elm has a certain className and then hide alpha,... + renderCallback: function($elm, toggled) {}, // this === instance; $elm: the input field;toggle === 'opened' -> just appeared; 'closed' -> just closed; else -> is rendering on pointer move + // toggled 'opened'/'closed' can for example be used to check if the $elm has a certain className and then hide alpha,... buildCallback: function($elm) {}, // this === instance; $elm: the UI css: '', // replaces existing css cssAddon: '', // adds css to existing @@ -65,10 +65,12 @@ The renderCallback can be used as openCallback and closeCallback: ```javascript renderCallback: function($elm, toggled) { - if (toggled === true) { // simple, lightweight check + if (toggled === 'opened') { // simple, lightweight check // ... like an open callback - } else if (toggled === false) { + } else if (toggled === 'closed') { // ... like a close callback + } else { + // ..on pointer move } } ``` diff --git a/jqColorPicker.js b/jqColorPicker.js index db6e13d..ebde97c 100644 --- a/jqColorPicker.js +++ b/jqColorPicker.js @@ -109,11 +109,11 @@ _$xy_slider._height = _$xy_slider.height(); _color.setColor(extractValue(_$trigger[0])); - preRender(true); + preRender('opened'); }); } else { $(_$UI).hide(_options.animationSpeed, function() { - preRender(false); + preRender('closed'); _colorPicker.$trigger = null; }); } @@ -260,7 +260,7 @@ _options.renderCallback.call( _colorPicker, _$trigger, - typeof toggled === 'boolean' ? toggled : undefined + typeof toggled === 'string' ? toggled : undefined ); } @@ -303,7 +303,7 @@ return this.on('focusin.a click.a', toggle) .on('change.a', function() { _color.setColor(this.value || '#FFF'); - _instance.colorPicker.render(true); + _instance.colorPicker.render('opened'); }) .each(function() { var value = extractValue(this), @@ -328,4 +328,4 @@ _instance = $(); }; -})); \ No newline at end of file +}));