X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fcolor%2Fcolor.js;fp=web%2Fcore%2Fmodules%2Fcolor%2Fcolor.js;h=1b036c3aa1bf05de327b243e34151a2adcb969fc;hp=984f740126d49a86479a59ea890acd4ef6fa8108;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5
diff --git a/web/core/modules/color/color.js b/web/core/modules/color/color.js
index 984f74012..1b036c3aa 100644
--- a/web/core/modules/color/color.js
+++ b/web/core/modules/color/color.js
@@ -1,26 +1,17 @@
/**
- * @file
- * Attaches the behaviors for the Color module.
- */
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
(function ($, Drupal) {
-
- 'use strict';
-
- /**
- * Displays farbtastic color selector and initialize color administration UI.
- *
- * @type {Drupal~behavior}
- *
- * @prop {Drupal~behaviorAttach} attach
- * Attach color selection behavior to relevant context.
- */
Drupal.behaviors.color = {
- attach: function (context, settings) {
- var i;
- var j;
- var colors;
- // This behavior attaches by ID, so is only valid once on a page.
+ attach: function attach(context, settings) {
+ var i = void 0;
+ var j = void 0;
+ var colors = void 0;
+
var form = $(context).find('#system-theme-settings .color-form').once('color');
if (form.length === 0) {
return;
@@ -30,11 +21,9 @@
var locks = [];
var focused = null;
- // Add Farbtastic.
$('').once('color').prependTo(form);
var farb = $.farbtastic('.color-placeholder');
- // Decode reference colors to HSL.
var reference = settings.color.reference;
for (i in reference) {
if (reference.hasOwnProperty(i)) {
@@ -42,35 +31,28 @@
}
}
- // Build a preview.
var height = [];
var width = [];
- // Loop through all defined gradients.
+
for (i in settings.gradients) {
if (settings.gradients.hasOwnProperty(i)) {
- // Add element to display the gradient.
$('.color-preview').once('color').append('');
var gradient = $('.color-preview #gradient-' + i);
- // Add height of current gradient to the list (divided by 10).
+
height.push(parseInt(gradient.css('height'), 10) / 10);
- // Add width of current gradient to the list (divided by 10).
+
width.push(parseInt(gradient.css('width'), 10) / 10);
- // Add rows (or columns for horizontal gradients).
- // Each gradient line should have a height (or width for horizontal
- // gradients) of 10px (because we divided the height/width by 10
- // above).
+
for (j = 0; j < (settings.gradients[i].direction === 'vertical' ? height[i] : width[i]); ++j) {
gradient.append('');
}
}
}
- // Set up colorScheme selector.
form.find('#edit-scheme').on('change', function () {
var schemes = settings.color.schemes;
var colorScheme = this.options[this.selectedIndex].value;
if (colorScheme !== '' && schemes[colorScheme]) {
- // Get colors of active scheme.
colors = schemes[colorScheme];
for (var fieldName in colors) {
if (colors.hasOwnProperty(fieldName)) {
@@ -81,66 +63,35 @@
}
});
- /**
- * Renders the preview.
- */
function preview() {
Drupal.color.callback(context, settings, form, farb, height, width);
}
- /**
- * Shifts a given color, using a reference pair (ref in HSL).
- *
- * This algorithm ensures relative ordering on the saturation and
- * luminance axes is preserved, and performs a simple hue shift.
- *
- * It is also symmetrical. If: shift_color(c, a, b) === d, then
- * shift_color(d, b, a) === c.
- *
- * @function Drupal.color~shift_color
- *
- * @param {string} given
- * A hex color code to shift.
- * @param {Array.} ref1
- * First HSL color reference.
- * @param {Array.} ref2
- * Second HSL color reference.
- *
- * @return {string}
- * A hex color, shifted.
- */
function shift_color(given, ref1, ref2) {
- var d;
- // Convert to HSL.
+ var d = void 0;
+
given = farb.RGBToHSL(farb.unpack(given));
- // Hue: apply delta.
given[0] += ref2[0] - ref1[0];
- // Saturation: interpolate.
if (ref1[1] === 0 || ref2[1] === 0) {
given[1] = ref2[1];
- }
- else {
+ } else {
d = ref1[1] / ref2[1];
if (d > 1) {
given[1] /= d;
- }
- else {
+ } else {
given[1] = 1 - (1 - given[1]) * d;
}
}
- // Luminance: interpolate.
if (ref1[2] === 0 || ref2[2] === 0) {
given[2] = ref2[2];
- }
- else {
+ } else {
d = ref1[2] / ref2[2];
if (d > 1) {
given[2] /= d;
- }
- else {
+ } else {
given[2] = 1 - (1 - given[2]) * d;
}
}
@@ -148,42 +99,27 @@
return farb.pack(farb.HSLToRGB(given));
}
- /**
- * Callback for Farbtastic when a new color is chosen.
- *
- * @param {HTMLElement} input
- * The input element where the color is chosen.
- * @param {string} color
- * The color that was chosen through the input.
- * @param {bool} propagate
- * Whether or not to propagate the color to a locked pair value
- * @param {bool} colorScheme
- * Flag to indicate if the user is using a color scheme when changing
- * the color.
- */
function callback(input, color, propagate, colorScheme) {
- var matched;
- // Set background/foreground colors.
+ var matched = void 0;
+
$(input).css({
backgroundColor: color,
color: farb.RGBToHSL(farb.unpack(color))[2] > 0.5 ? '#000' : '#fff'
});
- // Change input value.
if ($(input).val() && $(input).val() !== color) {
$(input).val(color);
- // Update locked values.
if (propagate) {
i = input.i;
- for (j = i + 1; ; ++j) {
+ for (j = i + 1;; ++j) {
if (!locks[j - 1] || $(locks[j - 1]).is('.is-unlocked')) {
break;
}
matched = shift_color(color, reference[input.key], reference[inputs[j].key]);
callback(inputs[j], matched, false);
}
- for (j = i - 1; ; --j) {
+ for (j = i - 1;; --j) {
if (!locks[j] || $(locks[j]).is('.is-unlocked')) {
break;
}
@@ -191,107 +127,75 @@
callback(inputs[j], matched, false);
}
- // Update preview.
preview();
}
- // Reset colorScheme selector.
if (!colorScheme) {
resetScheme();
}
}
}
- /**
- * Resets the color scheme selector.
- */
function resetScheme() {
form.find('#edit-scheme').each(function () {
this.selectedIndex = this.options.length - 1;
});
}
- /**
- * Focuses Farbtastic on a particular field.
- *
- * @param {jQuery.Event} e
- * The focus event on the field.
- */
function focus(e) {
var input = e.target;
- // Remove old bindings.
+
if (focused) {
- $(focused).off('keyup', farb.updateValue)
- .off('keyup', preview).off('keyup', resetScheme)
- .parent().removeClass('item-selected');
+ $(focused).off('keyup', farb.updateValue).off('keyup', preview).off('keyup', resetScheme).parent().removeClass('item-selected');
}
- // Add new bindings.
focused = input;
- farb.linkTo(function (color) { callback(input, color, true, false); });
+ farb.linkTo(function (color) {
+ callback(input, color, true, false);
+ });
farb.setColor(input.value);
- $(focused).on('keyup', farb.updateValue).on('keyup', preview).on('keyup', resetScheme)
- .parent().addClass('item-selected');
+ $(focused).on('keyup', farb.updateValue).on('keyup', preview).on('keyup', resetScheme).parent().addClass('item-selected');
}
- // Initialize color fields.
- form.find('.js-color-palette input.form-text')
- .each(function () {
- // Extract palette field name.
- this.key = this.id.substring(13);
-
- // Link to color picker temporarily to initialize.
- farb.linkTo(function () {}).setColor('#000').linkTo(this);
-
- // Add lock.
- var i = inputs.length;
- if (inputs.length) {
- var toggleClick = true;
- var lock = $('').on('click', function (e) {
- e.preventDefault();
- if (toggleClick) {
- $(this).addClass('is-unlocked').html(Drupal.t('Lock'));
- $(hooks[i - 1]).attr('class',
- locks[i - 2] && $(locks[i - 2]).is(':not(.is-unlocked)') ? 'color-palette__hook is-up' : 'color-palette__hook'
- );
- $(hooks[i]).attr('class',
- locks[i] && $(locks[i]).is(':not(.is-unlocked)') ? 'color-palette__hook is-down' : 'color-palette__hook'
- );
- }
- else {
- $(this).removeClass('is-unlocked').html(Drupal.t('Unlock'));
- $(hooks[i - 1]).attr('class',
- locks[i - 2] && $(locks[i - 2]).is(':not(.is-unlocked)') ? 'color-palette__hook is-both' : 'color-palette__hook is-down'
- );
- $(hooks[i]).attr('class',
- locks[i] && $(locks[i]).is(':not(.is-unlocked)') ? 'color-palette__hook is-both' : 'color-palette__hook is-up'
- );
- }
- toggleClick = !toggleClick;
- });
- $(this).after(lock);
- locks.push(lock);
- }
+ form.find('.js-color-palette input.form-text').each(function () {
+ this.key = this.id.substring(13);
+
+ farb.linkTo(function () {}).setColor('#000').linkTo(this);
+
+ var i = inputs.length;
+ if (inputs.length) {
+ var toggleClick = true;
+ var lock = $('').on('click', function (e) {
+ e.preventDefault();
+ if (toggleClick) {
+ $(this).addClass('is-unlocked').html(Drupal.t('Lock'));
+ $(hooks[i - 1]).attr('class', locks[i - 2] && $(locks[i - 2]).is(':not(.is-unlocked)') ? 'color-palette__hook is-up' : 'color-palette__hook');
+ $(hooks[i]).attr('class', locks[i] && $(locks[i]).is(':not(.is-unlocked)') ? 'color-palette__hook is-down' : 'color-palette__hook');
+ } else {
+ $(this).removeClass('is-unlocked').html(Drupal.t('Unlock'));
+ $(hooks[i - 1]).attr('class', locks[i - 2] && $(locks[i - 2]).is(':not(.is-unlocked)') ? 'color-palette__hook is-both' : 'color-palette__hook is-down');
+ $(hooks[i]).attr('class', locks[i] && $(locks[i]).is(':not(.is-unlocked)') ? 'color-palette__hook is-both' : 'color-palette__hook is-up');
+ }
+ toggleClick = !toggleClick;
+ });
+ $(this).after(lock);
+ locks.push(lock);
+ }
- // Add hook.
- var hook = $('');
- $(this).after(hook);
- hooks.push(hook);
+ var hook = $('');
+ $(this).after(hook);
+ hooks.push(hook);
- $(this).parent().find('.color-palette__lock').trigger('click');
- this.i = i;
- inputs.push(this);
- })
- .on('focus', focus);
+ $(this).parent().find('.color-palette__lock').trigger('click');
+ this.i = i;
+ inputs.push(this);
+ }).on('focus', focus);
form.find('.js-color-palette label');
- // Focus first color.
inputs[0].focus();
- // Render preview.
preview();
}
};
-
-})(jQuery, Drupal);
+})(jQuery, Drupal);
\ No newline at end of file