Netsyms/tinyColorPicker
2
0
Fork 0
mirror of https://github.com/PitPik/tinyColorPicker synced 2025-06-28 05:31:07 -06:00
Code Issues Releases Wiki Activity

fixed jQueryUI compatibility #21

Browse Source
This commit is contained in:
peterd 2015-04-18 15:31:06 +02:00
parent 987ede3684
commit b942c7b65f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jqColorPicker.js
View File

@ -11,8 +11,9 @@
_$trigger, _$trigger,
_$UI, _$xy_slider, _$xy_cursor, _$z_cursor , _$alpha , _$alpha_cursor, _$UI, _$xy_slider, _$xy_cursor, _$z_cursor , _$alpha , _$alpha_cursor,
_pointermove = 'touchmove mousemove pointermove', _pointermove = 'touchmove.a mousemove.a pointermove.a',
_pointerup = 'touchend mouseup pointerup', _pointerdown = 'touchstart.a mousedown.a pointerdown.a',
_pointerup = 'touchend.a mouseup.a pointerup.a',
_GPU = false, _GPU = false,
_animate = window.requestAnimationFrame || _animate = window.requestAnimationFrame ||
window.webkitRequestAnimationFrame || function(cb){cb()}, window.webkitRequestAnimationFrame || function(cb){cb()},
@ -127,7 +128,7 @@
this._width = this.offsetWidth; this._width = this.offsetWidth;
this._height = this.offsetHeight; this._height = this.offsetHeight;
}).hide(). }).hide().
on('touchstart mousedown pointerdown', on(_pointerdown,
'.cp-xy-slider,.cp-z-slider,.cp-alpha', pointerdown); '.cp-xy-slider,.cp-z-slider,.cp-alpha', pointerdown);
} }
@ -289,7 +290,7 @@
_selector += (_selector ? ', ' : '') + this.selector; _selector += (_selector ? ', ' : '') + this.selector;
$(options.body).off('.a'). $(options.body).off('.a').
on('touchstart.a mousedown.a pointerdown.a', function(e) { on(_pointerdown, function(e) {
var $target = $(e.target); var $target = $(e.target);
if ($.inArray($target.closest(_selector)[0], if ($.inArray($target.closest(_selector)[0],

2
jqColorPicker.js.map
View File

File diff suppressed because one or more lines are too long

4
jqColorPicker.min.js vendored
View File

File diff suppressed because one or more lines are too long