mirror of
https://github.com/PitPik/tinyColorPicker
synced 2025-06-28 05:31:07 -06:00
Added shape stabilizer
This commit is contained in:
parent
fd16aa9d7f
commit
02710f641f
@ -187,7 +187,7 @@ window.myColorPicker = $('input.color').colorPicker({
|
||||
},
|
||||
|
||||
cssAddon: // could also be in a css file instead
|
||||
'.cp-color-picker{width:226px;}' +
|
||||
'.cp-color-picker{box-sizing:border-box; width:226px;}' +
|
||||
'.cp-color-picker .cp-panel {line-height: 21px; float:right;' +
|
||||
'padding:0 1px 0 8px; margin-top:-1px; overflow:visible}' +
|
||||
'.cp-xy-slider:active {cursor:none;}' +
|
||||
@ -508,6 +508,10 @@ window.myColorPicker = $('input.color').colorPicker({
|
||||
that.toggle();
|
||||
}
|
||||
});
|
||||
// if input type="color"
|
||||
$('.color').on('click', function(e){
|
||||
e.preventDefault && e.preventDefault();
|
||||
});
|
||||
},
|
||||
|
||||
cssAddon: // could also be in a css file instead
|
||||
|
@ -75,7 +75,7 @@
|
||||
_colorPicker.$trigger = $this;
|
||||
|
||||
(_$UI || build()).css({
|
||||
'width': _$UI[0]._width,
|
||||
// 'width': _$UI[0]._width,
|
||||
'left': (_$UI[0]._left = position.left) -
|
||||
((_$UI[0]._left = _$UI[0]._left + _$UI[0]._width -
|
||||
($window.scrollLeft() + $window.width())) + gap > 0 ?
|
||||
@ -108,8 +108,7 @@
|
||||
$('head').append('<style type="text/css">' +
|
||||
(_options.css || _css) + (_options.cssAddon || '') + '</style>');
|
||||
|
||||
return _$UI = $(_html).css({'margin': _options.margin,
|
||||
'box-sizing': 'border-box'}).
|
||||
return _$UI = $(_html).css({'margin': _options.margin}).
|
||||
appendTo('body').
|
||||
show(0, function() {
|
||||
_GPU = _options.GPU && $(this).css('perspective') !== undefined;
|
||||
@ -119,6 +118,9 @@
|
||||
_$alpha = $('.cp-alpha', this).toggle(!!_options.opacity);
|
||||
_$alpha_cursor = $('.cp-alpha-cursor', this);
|
||||
_options.buidCallback.call(_colorPicker, $(this));
|
||||
$(this).prepend('<div>').children().eq(0).css('width',
|
||||
$(this).children().eq(0).width() // stabilizer
|
||||
);
|
||||
this._width = this.offsetWidth;
|
||||
this._height = this.offsetHeight;
|
||||
}).hide().
|
||||
|
File diff suppressed because one or more lines are too long
2
jqColorPicker.min.js
vendored
2
jqColorPicker.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user