mirror of
https://github.com/PitPik/tinyColorPicker
synced 2025-06-28 13:41:02 -06:00
fixed jQueryUI compatibility #21
This commit is contained in:
parent
987ede3684
commit
b942c7b65f
@ -11,8 +11,9 @@
|
||||
_$trigger,
|
||||
_$UI, _$xy_slider, _$xy_cursor, _$z_cursor , _$alpha , _$alpha_cursor,
|
||||
|
||||
_pointermove = 'touchmove mousemove pointermove',
|
||||
_pointerup = 'touchend mouseup pointerup',
|
||||
_pointermove = 'touchmove.a mousemove.a pointermove.a',
|
||||
_pointerdown = 'touchstart.a mousedown.a pointerdown.a',
|
||||
_pointerup = 'touchend.a mouseup.a pointerup.a',
|
||||
_GPU = false,
|
||||
_animate = window.requestAnimationFrame ||
|
||||
window.webkitRequestAnimationFrame || function(cb){cb()},
|
||||
@ -127,7 +128,7 @@
|
||||
this._width = this.offsetWidth;
|
||||
this._height = this.offsetHeight;
|
||||
}).hide().
|
||||
on('touchstart mousedown pointerdown',
|
||||
on(_pointerdown,
|
||||
'.cp-xy-slider,.cp-z-slider,.cp-alpha', pointerdown);
|
||||
}
|
||||
|
||||
@ -289,7 +290,7 @@
|
||||
_selector += (_selector ? ', ' : '') + this.selector;
|
||||
|
||||
$(options.body).off('.a').
|
||||
on('touchstart.a mousedown.a pointerdown.a', function(e) {
|
||||
on(_pointerdown, function(e) {
|
||||
var $target = $(e.target);
|
||||
|
||||
if ($.inArray($target.closest(_selector)[0],
|
||||
|
File diff suppressed because one or more lines are too long
4
jqColorPicker.min.js
vendored
4
jqColorPicker.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user