From: Timo Tijhof Date: Wed, 23 May 2018 16:28:23 +0000 (+0100) Subject: Remove the unused 'jquery.farbtastic' module X-Git-Tag: 1.34.0-rc.0~5334^2 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=5bf64e7f7231c234e145f4f1936add38575db3a2 Remove the unused 'jquery.farbtastic' module This was added in (r99923; 4d8c7e96ed1f) while reviewing the 'gadget-preferences' branch in SVN of the Gadgets extension during development of MediaWiki 1.18, intended for use in a color picker on Special:Gadgets as part of an experimental feature that was never completed (r94051). The module has no usage anywhere in Wikimedia Git, nor in any third-party hosted repos indexed by MediaWiki Codesearch, nor anywhere on-wiki at WMF in site scripts (per mwgrep). Bug: T193826 Bug: T192623 Change-Id: I8ed6c09dc7efd750ad4688b895b2e3f808a0e52b --- diff --git a/Gruntfile.js b/Gruntfile.js index 3687d2805e..8018212e85 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -27,7 +27,6 @@ module.exports = function ( grunt ) { '!node_modules/**', '!resources/lib/**', '!resources/src/jquery.tipsy/**', - '!resources/src/jquery/jquery.farbtastic.js', '!resources/src/mediawiki.libs.jpegmeta/**', // Third-party code of PHPUnit coverage report '!tests/coverage/**', diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32 index b63c644235..fa7c962f2e 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -106,6 +106,7 @@ because of Phabricator reports. * The es5-shim module, empty and deprecated since 1.29, was removed. * The mediawiki.widgets.visibleByteLimit module, deprecated in 1.32, was removed. Use mediawiki.widgets.visibleLengthLimit instead. +* The jquery.farbtastic module, unused since 1.18, was removed. === Deprecations in 1.32 === * Use of a StartProfiler.php file is deprecated in favour of placing diff --git a/jsduck.json b/jsduck.json index 18d514f0c6..e61303d345 100644 --- a/jsduck.json +++ b/jsduck.json @@ -14,8 +14,6 @@ "resources/src/jquery.tipsy", "resources/src/jquery/jquery.color.js", "resources/src/jquery/jquery.expandableField.js", - "resources/src/jquery/jquery.farbtastic.css", - "resources/src/jquery/jquery.farbtastic.js", "resources/src/jquery/jquery.highlightText.js", "resources/src/jquery/jquery.mw-jump.js", "resources/src/mediawiki.legacy", diff --git a/resources/Resources.php b/resources/Resources.php index 67969aeb55..57fd02c1f8 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -212,11 +212,6 @@ return [ 'jquery.expandableField' => [ 'scripts' => 'resources/src/jquery/jquery.expandableField.js', ], - 'jquery.farbtastic' => [ - 'scripts' => 'resources/src/jquery/jquery.farbtastic.js', - 'styles' => 'resources/src/jquery/jquery.farbtastic.css', - 'dependencies' => 'jquery.colorUtil', - ], 'jquery.form' => [ 'scripts' => 'resources/lib/jquery/jquery.form.js', ], diff --git a/resources/src/jquery/images/marker.png b/resources/src/jquery/images/marker.png deleted file mode 100644 index 915b347d15..0000000000 Binary files a/resources/src/jquery/images/marker.png and /dev/null differ diff --git a/resources/src/jquery/images/mask.png b/resources/src/jquery/images/mask.png deleted file mode 100644 index c9606b09ca..0000000000 Binary files a/resources/src/jquery/images/mask.png and /dev/null differ diff --git a/resources/src/jquery/images/wheel.png b/resources/src/jquery/images/wheel.png deleted file mode 100644 index d930224c86..0000000000 Binary files a/resources/src/jquery/images/wheel.png and /dev/null differ diff --git a/resources/src/jquery/jquery.farbtastic.css b/resources/src/jquery/jquery.farbtastic.css deleted file mode 100644 index 0cba34f496..0000000000 --- a/resources/src/jquery/jquery.farbtastic.css +++ /dev/null @@ -1,55 +0,0 @@ -/** - * Farbtastic Color Picker 1.2 - * © 2008 Steven Wittens - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -.farbtastic { - position: relative; -} -.farbtastic * { - position: absolute; - cursor: crosshair; -} -.farbtastic, -.farbtastic .wheel { - width: 195px; - height: 195px; -} -.farbtastic .color, -.farbtastic .overlay { - top: 47px; - left: 47px; - width: 101px; - height: 101px; -} -.farbtastic .wheel { - /* @embed */ - background: url( images/wheel.png ) no-repeat; - width: 195px; - height: 195px; -} -.farbtastic .overlay { - /* @embed */ - background: url( images/mask.png ) no-repeat; -} -.farbtastic .marker { - width: 17px; - height: 17px; - margin: -8px 0 0 -8px; - overflow: hidden; - /* @embed */ - background: url( images/marker.png ) no-repeat; -} diff --git a/resources/src/jquery/jquery.farbtastic.js b/resources/src/jquery/jquery.farbtastic.js deleted file mode 100644 index f70913f90f..0000000000 --- a/resources/src/jquery/jquery.farbtastic.js +++ /dev/null @@ -1,286 +0,0 @@ -/** - * Farbtastic Color Picker 1.2 - * © 2008 Steven Wittens - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -//Adapted to uniform style with jQuery UI widgets and slightly change behavior -//TODO: -// - remove duplicated code by replacing it with jquery.colorUtils and modern jQuery -// - uniform code style - -jQuery.fn.farbtastic = function (callback) { - $.farbtastic(this, callback); - return this; -}; - -jQuery.farbtastic = function (container, callback) { - var container = $(container).get(0); - return container.farbtastic || (container.farbtastic = new jQuery._farbtastic(container, callback)); -} - -jQuery._farbtastic = function (container, callback) { - // Store farbtastic object - var fb = this; - - // Insert markup - $(container).html('
'); - $(container).addClass('ui-widget'); - var e = $('.farbtastic', container); - fb.wheel = $('.wheel', container).get(0); - // Dimensions - fb.radius = 84; - fb.square = 100; - fb.width = 194; - - // Fix background PNGs in IE6 - if (navigator.appVersion.match(/MSIE [0-6]\./)) { - $('*', e).each(function () { - if (this.currentStyle.backgroundImage != 'none') { - var image = this.currentStyle.backgroundImage; - image = this.currentStyle.backgroundImage.slice(5, image.length - 2); - $(this).css( { - backgroundImage: 'none', - filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='" + image + "')" - } ); - } - }); - } - - /** - * Link to the given element(s) or callback. - */ - fb.linkTo = function (callback) { - // Unbind previous nodes - if (typeof fb.callback == 'object') { - $(fb.callback).unbind('keyup', fb.updateValue); - } - - // Reset color - fb.color = null; - - // Bind callback or elements - if (typeof callback == 'function') { - fb.callback = callback; - } - else if (typeof callback == 'object' || typeof callback == 'string') { - fb.callback = $(callback); - fb.callback.bind('keyup', fb.updateValue); - if (fb.callback.get(0).value) { - fb.setColor(fb.callback.get(0).value); - } - } - return this; - } - fb.updateValue = function (event) { - if (this.value != fb.color) { - fb.setColor(this.value); - } - } - - /** - * Change color with HTML syntax #123456 - */ - fb.setColor = function (color) { - var rgb = $.colorUtil.getRGB( color ); - if (fb.color != color && rgb) { - rgb = rgb.slice( 0 ); //make a clone - //TODO: rewrite code so that this is not needed - rgb[0] /= 255; - rgb[1] /= 255; - rgb[2] /= 255; - fb.color = color; - fb.rgb = rgb; - fb.hsl = fb.RGBToHSL(fb.rgb); - fb.updateDisplay(); - } - return this; - } - - /** - * Change color with HSL triplet [0..1, 0..1, 0..1] - */ - fb.setHSL = function (hsl) { - fb.hsl = hsl; - fb.rgb = fb.HSLToRGB(hsl); - fb.color = fb.pack(fb.rgb); - fb.updateDisplay(); - return this; - } - - ///////////////////////////////////////////////////// - - /** - * Retrieve the coordinates of the given event relative to the center - * of the widget. - */ - fb.widgetCoords = function (event) { - var ref = $( fb.wheel ).offset(); - return { - x: event.pageX - ref.left - fb.width / 2, - y: event.pageY - ref.top - fb.width / 2 - }; - } - - /** - * Mousedown handler - */ - fb.mousedown = function (event) { - // Capture mouse - if (!document.dragging) { - $(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup); - document.dragging = true; - } - - // Check which area is being dragged - var pos = fb.widgetCoords(event); - fb.circleDrag = Math.max(Math.abs(pos.x), Math.abs(pos.y)) * 2 > fb.square; - - // Process - fb.mousemove(event); - return false; - } - - /** - * Mousemove handler - */ - fb.mousemove = function (event) { - // Get coordinates relative to color picker center - var pos = fb.widgetCoords(event); - - // Set new HSL parameters - if (fb.circleDrag) { - var hue = Math.atan2(pos.x, -pos.y) / 6.28; - if (hue < 0) hue += 1; - fb.setHSL([hue, fb.hsl[1], fb.hsl[2]]); - } - else { - var sat = Math.max(0, Math.min(1, -(pos.x / fb.square) + .5)); - var lum = Math.max(0, Math.min(1, -(pos.y / fb.square) + .5)); - fb.setHSL([fb.hsl[0], sat, lum]); - } - return false; - } - - /** - * Mouseup handler - */ - fb.mouseup = function () { - // Uncapture mouse - $(document).unbind('mousemove', fb.mousemove); - $(document).unbind('mouseup', fb.mouseup); - document.dragging = false; - } - - /** - * Update the markers and styles - */ - fb.updateDisplay = function () { - // Markers - var angle = fb.hsl[0] * 6.28; - $('.h-marker', e).css({ - left: Math.round(Math.sin(angle) * fb.radius + fb.width / 2) + 'px', - top: Math.round(-Math.cos(angle) * fb.radius + fb.width / 2) + 'px' - }); - - $('.sl-marker', e).css({ - left: Math.round(fb.square * (.5 - fb.hsl[1]) + fb.width / 2) + 'px', - top: Math.round(fb.square * (.5 - fb.hsl[2]) + fb.width / 2) + 'px' - }); - - // Saturation/Luminance gradient - $('.color', e).css('backgroundColor', fb.pack(fb.HSLToRGB([fb.hsl[0], 1, 0.5]))); - - // Linked elements or callback - if (typeof fb.callback == 'object') { - // Set background/foreground color - $(fb.callback).css({ - backgroundColor: fb.color, - color: fb.hsl[2] > 0.5 ? '#000' : '#fff' - }); - - // Change linked value - $(fb.callback).each(function() { - if ( $( this ).val() != fb.color) { - $( this ).val( fb.color ).change(); - } - }); - } - else if (typeof fb.callback == 'function') { - fb.callback.call(fb, fb.color); - } - } - - /* Various color utility functions */ - fb.pack = function (rgb) { - var r = Math.round(rgb[0] * 255); - var g = Math.round(rgb[1] * 255); - var b = Math.round(rgb[2] * 255); - return '#' + (r < 16 ? '0' : '') + r.toString(16) + - (g < 16 ? '0' : '') + g.toString(16) + - (b < 16 ? '0' : '') + b.toString(16); - } - - fb.HSLToRGB = function (hsl) { - var m1, m2, r, g, b; - var h = hsl[0], s = hsl[1], l = hsl[2]; - m2 = (l <= 0.5) ? l * (s + 1) : l + s - l*s; - m1 = l * 2 - m2; - return [this.hueToRGB(m1, m2, h+0.33333), - this.hueToRGB(m1, m2, h), - this.hueToRGB(m1, m2, h-0.33333)]; - } - - fb.hueToRGB = function (m1, m2, h) { - h = (h < 0) ? h + 1 : ((h > 1) ? h - 1 : h); - if (h * 6 < 1) return m1 + (m2 - m1) * h * 6; - if (h * 2 < 1) return m2; - if (h * 3 < 2) return m1 + (m2 - m1) * (0.66666 - h) * 6; - return m1; - } - - fb.RGBToHSL = function (rgb) { - var min, max, delta, h, s, l; - var r = rgb[0], g = rgb[1], b = rgb[2]; - min = Math.min(r, Math.min(g, b)); - max = Math.max(r, Math.max(g, b)); - delta = max - min; - l = (min + max) / 2; - s = 0; - if (l > 0 && l < 1) { - s = delta / (l < 0.5 ? (2 * l) : (2 - 2 * l)); - } - h = 0; - if (delta > 0) { - if (max == r && max != g) h += (g - b) / delta; - if (max == g && max != b) h += (2 + (b - r) / delta); - if (max == b && max != r) h += (4 + (r - g) / delta); - h /= 6; - } - return [h, s, l]; - } - - // Install mousedown handler (the others are set on the document on-demand) - $('*', e).mousedown(fb.mousedown); - - // Init color - fb.setColor('#000000'); - - // Set linked elements/callback - if (callback) { - fb.linkTo(callback); - } -}