mirror of
https://github.com/wintercms/winter.git
synced 2024-06-28 05:33:29 +02:00
parent
ac2f10eda3
commit
7aae3f1ef8
@ -304,7 +304,7 @@
|
||||
|
||||
updateSelectionPaletteFromStorage();
|
||||
|
||||
offsetElement.bind("click.spectrum touchstart.spectrum", function (e) {
|
||||
offsetElement.on("click.spectrum touchstart.spectrum", function (e) {
|
||||
if (!disabled) {
|
||||
toggle();
|
||||
}
|
||||
@ -325,13 +325,13 @@
|
||||
|
||||
// Handle user typed input
|
||||
textInput.change(setFromTextInput);
|
||||
textInput.bind("paste", function () {
|
||||
textInput.on("paste", function () {
|
||||
setTimeout(setFromTextInput, 1);
|
||||
});
|
||||
textInput.keydown(function (e) { if (e.keyCode == 13) { setFromTextInput(); } });
|
||||
|
||||
cancelButton.text(opts.cancelText);
|
||||
cancelButton.bind("click.spectrum", function (e) {
|
||||
cancelButton.on("click.spectrum", function (e) {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
revert();
|
||||
@ -339,7 +339,7 @@
|
||||
});
|
||||
|
||||
clearButton.attr("title", opts.clearText);
|
||||
clearButton.bind("click.spectrum", function (e) {
|
||||
clearButton.on("click.spectrum", function (e) {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
isEmpty = true;
|
||||
@ -352,7 +352,7 @@
|
||||
});
|
||||
|
||||
chooseButton.text(opts.chooseText);
|
||||
chooseButton.bind("click.spectrum", function (e) {
|
||||
chooseButton.on("click.spectrum", function (e) {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
|
||||
@ -367,7 +367,7 @@
|
||||
});
|
||||
|
||||
toggleButton.text(opts.showPaletteOnly ? opts.togglePaletteMoreText : opts.togglePaletteLessText);
|
||||
toggleButton.bind("click.spectrum", function (e) {
|
||||
toggleButton.on("click.spectrum", function (e) {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
|
||||
@ -462,9 +462,14 @@
|
||||
else {
|
||||
set($(e.target).closest(".sp-thumb-el").data("color"));
|
||||
move();
|
||||
updateOriginalInput(true);
|
||||
|
||||
// If the picker is going to close immediately, a palette selection
|
||||
// is a change. Otherwise, it's a move only.
|
||||
if (opts.hideAfterPaletteSelect) {
|
||||
hide();
|
||||
updateOriginalInput(true);
|
||||
hide();
|
||||
} else {
|
||||
updateOriginalInput();
|
||||
}
|
||||
}
|
||||
|
||||
@ -472,8 +477,8 @@
|
||||
}
|
||||
|
||||
var paletteEvent = IE ? "mousedown.spectrum" : "click.spectrum touchstart.spectrum";
|
||||
paletteContainer.delegate(".sp-thumb-el", paletteEvent, paletteElementClick);
|
||||
initialColorContainer.delegate(".sp-thumb-el:nth-child(1)", paletteEvent, { ignore: true }, paletteElementClick);
|
||||
paletteContainer.on(paletteEvent, ".sp-thumb-el", paletteElementClick);
|
||||
initialColorContainer.on(paletteEvent, ".sp-thumb-el:nth-child(1)", { ignore: true }, paletteElementClick);
|
||||
}
|
||||
|
||||
function updateSelectionPaletteFromStorage() {
|
||||
@ -580,13 +585,15 @@
|
||||
|
||||
if ((value === null || value === "") && allowEmpty) {
|
||||
set(null);
|
||||
updateOriginalInput(true);
|
||||
move();
|
||||
updateOriginalInput();
|
||||
}
|
||||
else {
|
||||
var tiny = tinycolor(value);
|
||||
if (tiny.isValid()) {
|
||||
set(tiny);
|
||||
updateOriginalInput(true);
|
||||
move();
|
||||
updateOriginalInput();
|
||||
}
|
||||
else {
|
||||
textInput.addClass("sp-validation-error");
|
||||
@ -620,9 +627,9 @@
|
||||
hideAll();
|
||||
visible = true;
|
||||
|
||||
$(doc).bind("keydown.spectrum", onkeydown);
|
||||
$(doc).bind("click.spectrum", clickout);
|
||||
$(window).bind("resize.spectrum", resize);
|
||||
$(doc).on("keydown.spectrum", onkeydown);
|
||||
$(doc).on("click.spectrum", clickout);
|
||||
$(window).on("resize.spectrum", resize);
|
||||
replacer.addClass("sp-active");
|
||||
container.removeClass("sp-hidden");
|
||||
|
||||
@ -665,9 +672,9 @@
|
||||
if (!visible || flat) { return; }
|
||||
visible = false;
|
||||
|
||||
$(doc).unbind("keydown.spectrum", onkeydown);
|
||||
$(doc).unbind("click.spectrum", clickout);
|
||||
$(window).unbind("resize.spectrum", resize);
|
||||
$(doc).off("keydown.spectrum", onkeydown);
|
||||
$(doc).off("click.spectrum", clickout);
|
||||
$(window).off("resize.spectrum", resize);
|
||||
|
||||
replacer.removeClass("sp-active");
|
||||
container.addClass("sp-hidden");
|
||||
@ -678,6 +685,7 @@
|
||||
|
||||
function revert() {
|
||||
set(colorOnShow, true);
|
||||
updateOriginalInput(true);
|
||||
}
|
||||
|
||||
function set(color, ignoreFormatChange) {
|
||||
@ -719,7 +727,7 @@
|
||||
h: currentHue,
|
||||
s: currentSaturation,
|
||||
v: currentValue,
|
||||
a: Math.round(currentAlpha * 100) / 100
|
||||
a: Math.round(currentAlpha * 1000) / 1000
|
||||
}, { format: opts.format || currentPreferredFormat });
|
||||
}
|
||||
|
||||
@ -909,7 +917,7 @@
|
||||
|
||||
function destroy() {
|
||||
boundElement.show();
|
||||
offsetElement.unbind("click.spectrum touchstart.spectrum");
|
||||
offsetElement.off("click.spectrum touchstart.spectrum");
|
||||
container.remove();
|
||||
replacer.remove();
|
||||
spectrums[spect.id] = null;
|
||||
@ -988,17 +996,27 @@
|
||||
var viewWidth = docElem.clientWidth + $(doc).scrollLeft();
|
||||
var viewHeight = docElem.clientHeight + $(doc).scrollTop();
|
||||
var offset = input.offset();
|
||||
offset.top += inputHeight;
|
||||
var offsetLeft = offset.left;
|
||||
var offsetTop = offset.top;
|
||||
|
||||
offset.left -=
|
||||
Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
|
||||
Math.abs(offset.left + dpWidth - viewWidth) : 0);
|
||||
offsetTop += inputHeight;
|
||||
|
||||
offset.top -=
|
||||
Math.min(offset.top, ((offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
|
||||
offsetLeft -=
|
||||
Math.min(offsetLeft, (offsetLeft + dpWidth > viewWidth && viewWidth > dpWidth) ?
|
||||
Math.abs(offsetLeft + dpWidth - viewWidth) : 0);
|
||||
|
||||
offsetTop -=
|
||||
Math.min(offsetTop, ((offsetTop + dpHeight > viewHeight && viewHeight > dpHeight) ?
|
||||
Math.abs(dpHeight + inputHeight - extraY) : extraY));
|
||||
|
||||
return offset;
|
||||
return {
|
||||
top: offsetTop,
|
||||
bottom: offset.bottom,
|
||||
left: offsetLeft,
|
||||
right: offset.right,
|
||||
width: offset.width,
|
||||
height: offset.height
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1091,7 +1109,7 @@
|
||||
maxWidth = $(element).width();
|
||||
offset = $(element).offset();
|
||||
|
||||
$(doc).bind(duringDragEvents);
|
||||
$(doc).on(duringDragEvents);
|
||||
$(doc.body).addClass("sp-dragging");
|
||||
|
||||
move(e);
|
||||
@ -1103,7 +1121,7 @@
|
||||
|
||||
function stop() {
|
||||
if (dragging) {
|
||||
$(doc).unbind(duringDragEvents);
|
||||
$(doc).off(duringDragEvents);
|
||||
$(doc.body).removeClass("sp-dragging");
|
||||
|
||||
// Wait a tick before notifying observers to allow the click event
|
||||
@ -1115,7 +1133,7 @@
|
||||
dragging = false;
|
||||
}
|
||||
|
||||
$(element).bind("touchstart mousedown", start);
|
||||
$(element).on("touchstart mousedown", start);
|
||||
}
|
||||
|
||||
function throttle(func, wait, debounce) {
|
||||
@ -1178,7 +1196,7 @@
|
||||
|
||||
// Initializing a new instance of spectrum
|
||||
return this.spectrum("destroy").each(function () {
|
||||
var options = $.extend({}, opts, $(this).data());
|
||||
var options = $.extend({}, $(this).data(), opts);
|
||||
var spect = spectrum(this, options);
|
||||
$(this).data(dataID, spect.id);
|
||||
});
|
||||
@ -1244,7 +1262,7 @@
|
||||
this._g = rgb.g,
|
||||
this._b = rgb.b,
|
||||
this._a = rgb.a,
|
||||
this._roundA = mathRound(100*this._a) / 100,
|
||||
this._roundA = mathRound(1000 * this._a) / 1000,
|
||||
this._format = opts.format || rgb.format;
|
||||
this._gradientType = opts.gradientType;
|
||||
|
||||
@ -1285,7 +1303,7 @@
|
||||
},
|
||||
setAlpha: function(value) {
|
||||
this._a = boundAlpha(value);
|
||||
this._roundA = mathRound(100*this._a) / 100;
|
||||
this._roundA = mathRound(1000 * this._a) / 1000;
|
||||
return this;
|
||||
},
|
||||
toHsv: function() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user