Return to jQuery rendering

pull/25/head
peterd 9 years ago
parent 6fbe600e4a
commit bfb4d0f4dd

@ -94,9 +94,10 @@
find('.cp-alpha').toggle(!!_options.opacity). find('.cp-alpha').toggle(!!_options.opacity).
parent(). // back to $(_html) parent(). // back to $(_html)
show(0, function() { show(0, function() {
_GPU = _options.GPU && _GPU = _options.GPU && $(this).css('perspective') === '';
$('<div>').css('transform', 'matrix(1,0,0,2,0,0)')[0]. // _GPU = _options.GPU &&
style.cssText.replace(/2.*$/, '1,'); // $('<div>').css('transform', 'matrix(1,0,0,2,0,0)')[0].
// style.cssText.replace(/2.*$/, '1,');
_options.buidCallback.call(_colorPicker, $(this)); _options.buidCallback.call(_colorPicker, $(this));
_$xy_slider = $('.cp-xy-slider', this); _$xy_slider = $('.cp-xy-slider', this);
_$xy_cursor = $('.cp-xy-cursor', this); _$xy_cursor = $('.cp-xy-cursor', this);
@ -175,59 +176,59 @@
h = (1 - colors.hsv.h) * _cache.sliderWidth, h = (1 - colors.hsv.h) * _cache.sliderWidth,
s = colors.hsv.s * _cache.sliderWidth, s = colors.hsv.s * _cache.sliderWidth,
v = (1 - colors.hsv.v) * _cache.sliderWidth, v = (1 - colors.hsv.v) * _cache.sliderWidth,
a = alpha * _cache.alphaWidth; //, a = alpha * _cache.alphaWidth,
// t3d = _GPU ? 'translate3d' : ''; t3d = _GPU ? 'translate3d' : '';
// _$xy_slider.css({ _$xy_slider.css({
// backgroundColor: 'rgb(' + backgroundColor: 'rgb(' +
// hueRGB.r + ',' + hueRGB.g + ',' + hueRGB.b + ')'}); hueRGB.r + ',' + hueRGB.g + ',' + hueRGB.b + ')'});
// _$xy_cursor.css({ _$xy_cursor.css({
// transform: t3d + '(' + s + 'px, ' + v + 'px, 0)', transform: t3d + '(' + s + 'px, ' + v + 'px, 0)',
// left: !_GPU ? s : '', left: !_GPU ? s : '',
// top: !_GPU ? v : '', top: !_GPU ? v : '',
// borderColor : colors.RGBLuminance > 0.22 ? dark : light borderColor : colors.RGBLuminance > 0.22 ? dark : light
// }); });
// _$z_cursor.css({ _$z_cursor.css({
// transform: t3d + '(0, ' + h + 'px, 0)', transform: t3d + '(0, ' + h + 'px, 0)',
// top: !_GPU ? h : '', top: !_GPU ? h : '',
// borderColor : 'transparent ' + HUEContrast, borderColor : 'transparent ' + HUEContrast,
// }); });
// _$alpha.css({backgroundColor: 'rgb(' + RGBInnerText + ')'}); _$alpha.css({backgroundColor: 'rgb(' + RGBInnerText + ')'});
// _$alpha_cursor.css({ _$alpha_cursor.css({
// transform: t3d + '(' + a + 'px, 0, 0)', transform: t3d + '(' + a + 'px, 0, 0)',
// left: !_GPU ? a : '', left: !_GPU ? a : '',
// borderColor : alphaContrast + ' transparent' borderColor : alphaContrast + ' transparent'
// }); });
// _options.doRender && _cache.$element.css({ _options.doRender && _cache.$element.css({
// backgroundColor : RGBAText, backgroundColor : text,
// color: colors.rgbaMixBGMixCustom.luminance > 0.22 ? dark : light color: colors.rgbaMixBGMixCustom.luminance > 0.22 ? dark : light
// }); });
// _cache.$element.val(text); _cache.$element.val(text);
// faster version (more than 2.5x)... though, no jQuery (colors, ...) // faster version (more than 2.5x)... though, no jQuery (colors, ...)
_$xy_slider[0].style.cssText = // _$xy_slider[0].style.cssText =
'background-color:' + 'rgb(' + // 'background-color:' + 'rgb(' +
hueRGB.r + ',' + hueRGB.g + ',' + hueRGB.b + ');'; // hueRGB.r + ',' + hueRGB.g + ',' + hueRGB.b + ');';
_$xy_cursor[0].style.cssText = // _$xy_cursor[0].style.cssText =
(_GPU ? _GPU + s + ',' + v + ');' : // (_GPU ? _GPU + s + ',' + v + ');' :
'left:' + s + 'px;' + 'top:' + v + 'px;') + // 'left:' + s + 'px;' + 'top:' + v + 'px;') +
'border-color:' + (colors.RGBLuminance > 0.22 ? dark : light); // 'border-color:' + (colors.RGBLuminance > 0.22 ? dark : light);
_$z_cursor[0].style.cssText = // _$z_cursor[0].style.cssText =
(_GPU ? _GPU + '0,' + h + ');' : // (_GPU ? _GPU + '0,' + h + ');' :
'top:' + h + 'px;') + // 'top:' + h + 'px;') +
'border-color:' + 'transparent ' + HUEContrast; // 'border-color:' + 'transparent ' + HUEContrast;
_$alpha[0].style.cssText = 'background-color:' + '#' + colors.HEX; // _$alpha[0].style.cssText = 'background-color:' + '#' + colors.HEX;
_$alpha_cursor[0].style.cssText = // _$alpha_cursor[0].style.cssText =
(_GPU ? _GPU + a + ', 0);' : // (_GPU ? _GPU + a + ', 0);' :
'left:' + a + 'px;') + // 'left:' + a + 'px;') +
'border-color:' + alphaContrast + ' transparent'; // 'border-color:' + alphaContrast + ' transparent';
_options.doRender && (_cache.$element[0].style.cssText = // _options.doRender && (_cache.$element[0].style.cssText =
'background-color:' + text + // 'background-color:' + text +
';color:' + (colors.rgbaMixBGMixCustom.luminance > 0.22 ? dark : light)); // ';color:' + (colors.rgbaMixBGMixCustom.luminance > 0.22 ? dark : light));
_cache.$element[0].value = text; // _cache.$element[0].value = text;
_options.renderCallback.call( _options.renderCallback.call(
_colorPicker, _colorPicker,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save