From e37fdd4ada4ef4cf496b822a37a6d79bacd3324e Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 10 Nov 2015 15:44:04 -0800 Subject: [PATCH] Update OOjs UI to v0.13.2 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.13.2/History.md Change-Id: I0626d91d4b93e1d680579f1e6a02555c6050127f --- composer.json | 2 +- resources/lib/oojs-ui/i18n/bs.json | 1 + resources/lib/oojs-ui/i18n/cs.json | 6 +- resources/lib/oojs-ui/i18n/wuu.json | 5 +- .../lib/oojs-ui/oojs-ui-apex-noimages.css | 46 +++--- resources/lib/oojs-ui/oojs-ui-apex.js | 4 +- .../oojs-ui/oojs-ui-mediawiki-noimages.css | 41 +++-- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 4 +- resources/lib/oojs-ui/oojs-ui.js | 152 ++++++++++-------- .../themes/apex/icons-editing-advanced.json | 2 +- .../oojs-ui/themes/apex/images/icons/add.png | Bin 144 -> 145 bytes .../oojs-ui/themes/apex/images/icons/add.svg | 2 +- .../themes/apex/images/icons/insert.png | Bin 144 -> 0 bytes .../themes/apex/images/icons/insert.svg | 6 - .../apex/images/icons/noWikiText-ltr.png | Bin 234 -> 231 bytes .../apex/images/icons/noWikiText-ltr.svg | 4 +- .../apex/images/icons/noWikiText-rtl.png | Bin 228 -> 229 bytes .../apex/images/icons/noWikiText-rtl.svg | 4 +- .../themes/apex/images/icons/wikiText.png | Bin 163 -> 156 bytes .../themes/apex/images/icons/wikiText.svg | 16 +- .../mediawiki/icons-editing-advanced.json | 2 +- .../images/icons/add-constructive.png | Bin 152 -> 153 bytes .../images/icons/add-constructive.svg | 2 +- .../mediawiki/images/icons/add-invert.png | Bin 148 -> 148 bytes .../mediawiki/images/icons/add-invert.svg | 2 +- .../themes/mediawiki/images/icons/add.png | Bin 144 -> 145 bytes .../themes/mediawiki/images/icons/add.svg | 2 +- .../mediawiki/images/icons/insert-invert.png | Bin 148 -> 0 bytes .../mediawiki/images/icons/insert-invert.svg | 6 - .../themes/mediawiki/images/icons/insert.png | Bin 144 -> 0 bytes .../themes/mediawiki/images/icons/insert.svg | 6 - .../mediawiki/images/icons/menu-invert.png | Bin 246 -> 185 bytes .../mediawiki/images/icons/menu-invert.svg | 2 +- .../themes/mediawiki/images/icons/menu.png | Bin 218 -> 172 bytes .../themes/mediawiki/images/icons/menu.svg | 2 +- .../images/icons/noWikiText-ltr-invert.png | Bin 242 -> 239 bytes .../images/icons/noWikiText-ltr-invert.svg | 4 +- .../mediawiki/images/icons/noWikiText-ltr.png | Bin 234 -> 231 bytes .../mediawiki/images/icons/noWikiText-ltr.svg | 4 +- .../images/icons/noWikiText-rtl-invert.png | Bin 233 -> 232 bytes .../images/icons/noWikiText-rtl-invert.svg | 4 +- .../mediawiki/images/icons/noWikiText-rtl.png | Bin 228 -> 229 bytes .../mediawiki/images/icons/noWikiText-rtl.svg | 4 +- .../images/icons/wikiText-invert.png | Bin 171 -> 165 bytes .../images/icons/wikiText-invert.svg | 16 +- .../mediawiki/images/icons/wikiText.png | Bin 163 -> 156 bytes .../mediawiki/images/icons/wikiText.svg | 16 +- 47 files changed, 190 insertions(+), 177 deletions(-) delete mode 100644 resources/lib/oojs-ui/themes/apex/images/icons/insert.png delete mode 100644 resources/lib/oojs-ui/themes/apex/images/icons/insert.svg delete mode 100644 resources/lib/oojs-ui/themes/mediawiki/images/icons/insert-invert.png delete mode 100644 resources/lib/oojs-ui/themes/mediawiki/images/icons/insert-invert.svg delete mode 100644 resources/lib/oojs-ui/themes/mediawiki/images/icons/insert.png delete mode 100644 resources/lib/oojs-ui/themes/mediawiki/images/icons/insert.svg diff --git a/composer.json b/composer.json index 1cdf8136ca..bf4d40267c 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-iconv": "*", "liuggio/statsd-php-client": "1.0.16", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.13.1", + "oojs/oojs-ui": "0.13.2", "oyejorge/less.php": "1.7.0.9", "php": ">=5.3.3", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/i18n/bs.json b/resources/lib/oojs-ui/i18n/bs.json index 162790e2e6..d41efdbf2d 100644 --- a/resources/lib/oojs-ui/i18n/bs.json +++ b/resources/lib/oojs-ui/i18n/bs.json @@ -18,5 +18,6 @@ "ooui-dialog-process-dismiss": "Odbaci", "ooui-dialog-process-retry": "Pokušajte ponovo", "ooui-dialog-process-continue": "Nastavi", + "ooui-selectfile-button-select": "Izaberi datoteku", "ooui-selectfile-placeholder": "Nijedna datoteka nije izabrana" } diff --git a/resources/lib/oojs-ui/i18n/cs.json b/resources/lib/oojs-ui/i18n/cs.json index fb93e3a36c..734b738de1 100644 --- a/resources/lib/oojs-ui/i18n/cs.json +++ b/resources/lib/oojs-ui/i18n/cs.json @@ -11,7 +11,8 @@ "Polda18", "Tchoř", "ශ්වෙත", - "Vojtěch Dostál" + "Vojtěch Dostál", + "Matěj Suchánek" ] }, "ooui-outline-control-move-down": "Přesunout položku dolů", @@ -28,5 +29,6 @@ "ooui-dialog-process-continue": "Pokračovat", "ooui-selectfile-button-select": "Vybrat soubor", "ooui-selectfile-not-supported": "Výběr souboru není podporován", - "ooui-selectfile-placeholder": "Nebyl vybrán žádný soubor" + "ooui-selectfile-placeholder": "Nebyl vybrán žádný soubor", + "ooui-selectfile-dragdrop-placeholder": "Umístěte soubor sem" } diff --git a/resources/lib/oojs-ui/i18n/wuu.json b/resources/lib/oojs-ui/i18n/wuu.json index 61e3d01e72..64816249d1 100644 --- a/resources/lib/oojs-ui/i18n/wuu.json +++ b/resources/lib/oojs-ui/i18n/wuu.json @@ -2,8 +2,9 @@ "@metadata": { "authors": [ "Malafaya", - "十弌" + "十弌", + "飞舞回堂前" ] }, - "ooui-toolbar-more": "還多" + "ooui-toolbar-more": "更多" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css index 9abc847eba..15cd4bee1d 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.13.1 + * OOjs UI v0.13.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-11-03T21:42:28Z + * Date: 2015-11-10T23:33:07Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -1489,6 +1489,7 @@ } .oo-ui-progressBarWidget { max-width: 50em; + background-color: #ffffff; border: 1px solid #cccccc; border-radius: 0.25em; overflow: hidden; @@ -1562,9 +1563,9 @@ overflow: hidden; } .oo-ui-popupWidget-popup { + background-color: #ffffff; border: 1px solid #cccccc; border-radius: 0.25em; - background-color: #ffffff; box-shadow: 0 0.15em 0.5em 0 rgba(0, 0, 0, 0.2); } .oo-ui-popupWidget-anchored .oo-ui-popupWidget-popup { @@ -1658,7 +1659,7 @@ box-sizing: border-box; } .oo-ui-dropdownInputWidget select { - background: #ffffff; + background-color: #ffffff; height: 2.5em; padding: 0.5em; font-size: inherit; @@ -1837,7 +1838,7 @@ } .oo-ui-menuSelectWidget { position: absolute; - background: #ffffff; + background-color: #ffffff; margin-top: -1px; border: 1px solid #cccccc; border-radius: 0 0 0.25em 0.25em; @@ -1879,6 +1880,7 @@ position: relative; width: 100%; max-width: 50em; + background-color: #ffffff; margin-right: 0.5em; } .oo-ui-dropdownWidget-handle { @@ -2035,6 +2037,7 @@ } .oo-ui-selectFileWidget-info { height: 2.4em; + background-color: #ffffff; border: 1px solid rgba(0, 0, 0, 0.1); border-radius: 0.25em; } @@ -2117,10 +2120,10 @@ } .oo-ui-selectFileWidget-dropTarget { line-height: 3.5em; + background-color: #ffffff; border: 1px dashed #aaaaaa; padding: 0.5em 1em; margin-bottom: 0.5em; - background: #ffffff; text-align: center; vertical-align: middle; } @@ -2422,36 +2425,41 @@ .oo-ui-capsuleItemWidget.oo-ui-widget-disabled > .oo-ui-indicatorElement-indicator { opacity: 0.2; } -.oo-ui-comboBoxWidget { +.oo-ui-comboBoxInputWidget { display: inline-block; position: relative; width: 100%; max-width: 50em; margin-right: 0.5em; } -.oo-ui-comboBoxWidget > .oo-ui-menuSelectWidget { +.oo-ui-comboBoxInputWidget > .oo-ui-menuSelectWidget { z-index: 1; width: 100%; } -.oo-ui-comboBoxWidget > .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { +.oo-ui-comboBoxInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { cursor: pointer; } -.oo-ui-comboBoxWidget:last-child { - margin-right: 0; +.oo-ui-comboBoxInputWidget-php input::-webkit-calendar-picker-indicator { + opacity: 0 !important; + position: absolute; + right: 0; + top: 0; + height: 2.5em; + width: 2.5em; + padding: 0; } -.oo-ui-comboBoxWidget-handle { - border: 1px solid rgba(0, 0, 0, 0.1); - border-radius: 0.25em; +.oo-ui-comboBoxInputWidget-php > .oo-ui-indicatorElement-indicator { + pointer-events: none; } -.oo-ui-comboBoxWidget-handle:hover { - border-color: rgba(0, 0, 0, 0.2); +.oo-ui-comboBoxInputWidget:last-child { + margin-right: 0; } -.oo-ui-comboBoxWidget.oo-ui-widget-disabled .oo-ui-textInputWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator, -.oo-ui-comboBoxWidget-empty .oo-ui-textInputWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { +.oo-ui-comboBoxInputWidget.oo-ui-widget-disabled .oo-ui-textInputWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator, +.oo-ui-comboBoxInputWidget-empty .oo-ui-textInputWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { cursor: default; opacity: 0.2; } -.oo-ui-comboBoxWidget > .oo-ui-selectWidget { +.oo-ui-comboBoxInputWidget > .oo-ui-selectWidget { margin-top: -3px; } .oo-ui-searchWidget-query { diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 00a09663ca..145bca3e80 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.13.1 + * OOjs UI v0.13.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-11-03T21:42:20Z + * Date: 2015-11-10T23:32:59Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index fdb06e55b2..f5b431cda0 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.13.1 + * OOjs UI v0.13.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-11-03T21:42:28Z + * Date: 2015-11-10T23:33:07Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -1550,6 +1550,7 @@ } .oo-ui-progressBarWidget { max-width: 50em; + background-color: #ffffff; border: 1px solid #cccccc; border-radius: 0.1em; overflow: hidden; @@ -1613,9 +1614,9 @@ overflow: hidden; } .oo-ui-popupWidget-popup { + background-color: #ffffff; border: 1px solid #aaaaaa; border-radius: 0.2em; - background-color: #ffffff; box-shadow: 0 0.15em 0 0 rgba(0, 0, 0, 0.15); } .oo-ui-popupWidget-anchored .oo-ui-popupWidget-popup { @@ -1778,7 +1779,7 @@ box-sizing: border-box; } .oo-ui-dropdownInputWidget select { - background: #ffffff; + background-color: #ffffff; height: 2.275em; font-size: inherit; font-family: inherit; @@ -2056,7 +2057,7 @@ } .oo-ui-menuSelectWidget { position: absolute; - background: #ffffff; + background-color: #ffffff; margin-top: -1px; border: 1px solid #aaaaaa; border-radius: 0 0 0.2em 0.2em; @@ -2106,7 +2107,7 @@ position: relative; width: 100%; max-width: 50em; - background: #ffffff; + background-color: #ffffff; margin-right: 0.5em; } .oo-ui-dropdownWidget-handle { @@ -2139,6 +2140,7 @@ .oo-ui-dropdownWidget-handle { padding: 0.5em 0; height: 2.275em; + line-height: 1.275; border: 1px solid #cccccc; border-radius: 0.1em; } @@ -2267,6 +2269,7 @@ } .oo-ui-selectFileWidget-info { height: 2.4em; + background-color: #ffffff; border: 1px solid #cccccc; border-radius: 0.1em; } @@ -2349,10 +2352,10 @@ } .oo-ui-selectFileWidget-dropTarget { line-height: 3.5em; + background-color: #ffffff; border: 1px dashed #cccccc; padding: 0.5em 1em; margin-bottom: 0.5em; - background: #ffffff; text-align: center; vertical-align: middle; } @@ -2644,25 +2647,37 @@ .oo-ui-capsuleItemWidget.oo-ui-widget-disabled > .oo-ui-indicatorElement-indicator { opacity: 0.2; } -.oo-ui-comboBoxWidget { +.oo-ui-comboBoxInputWidget { display: inline-block; position: relative; width: 100%; max-width: 50em; margin-right: 0.5em; } -.oo-ui-comboBoxWidget > .oo-ui-menuSelectWidget { +.oo-ui-comboBoxInputWidget > .oo-ui-menuSelectWidget { z-index: 1; width: 100%; } -.oo-ui-comboBoxWidget > .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { +.oo-ui-comboBoxInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { cursor: pointer; } -.oo-ui-comboBoxWidget:last-child { +.oo-ui-comboBoxInputWidget-php input::-webkit-calendar-picker-indicator { + opacity: 0 !important; + position: absolute; + right: 0; + top: 0; + height: 2.5em; + width: 2.5em; + padding: 0; +} +.oo-ui-comboBoxInputWidget-php > .oo-ui-indicatorElement-indicator { + pointer-events: none; +} +.oo-ui-comboBoxInputWidget:last-child { margin-right: 0; } -.oo-ui-comboBoxWidget .oo-ui-textInputWidget input, -.oo-ui-comboBoxWidget .oo-ui-textInputWidget textarea { +.oo-ui-comboBoxInputWidget input, +.oo-ui-comboBoxInputWidget textarea { height: 2.35em; } .oo-ui-searchWidget-query { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index d9a17a2249..757a9655fa 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.13.1 + * OOjs UI v0.13.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-11-03T21:42:20Z + * Date: 2015-11-10T23:32:59Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index b4dc48c8e7..511ec94bff 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.13.1 + * OOjs UI v0.13.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-11-03T21:42:20Z + * Date: 2015-11-10T23:32:59Z */ ( function ( OO ) { @@ -5908,10 +5908,12 @@ OO.ui.mixin.LabelElement.prototype.setLabelContent = function ( label ) { * @cfg {jQuery} [$container=this.$element] The container element. The lookup menu is rendered beneath the specified element. * @cfg {boolean} [allowSuggestionsWhenEmpty=false] Request and display a lookup menu when the text input is empty. * By default, the lookup menu is not generated and displayed until the user begins to type. + * @cfg {boolean} [highlightFirst=true] Whether the first lookup result should be highlighted (so, that the user can + * take it over into the input with simply pressing return) automatically or not. */ OO.ui.mixin.LookupElement = function OoUiMixinLookupElement( config ) { // Configuration initialization - config = config || {}; + config = $.extend( { highlightFirst: true }, config ); // Properties this.$overlay = config.$overlay || this.$element; @@ -5928,6 +5930,7 @@ OO.ui.mixin.LookupElement = function OoUiMixinLookupElement( config ) { this.lookupRequest = null; this.lookupsDisabled = false; this.lookupInputFocused = false; + this.lookupHighlightFirstItem = config.highlightFirst; // Events this.$input.on( { @@ -6115,13 +6118,13 @@ OO.ui.mixin.LookupElement.prototype.populateLookupMenu = function () { }; /** - * Highlight the first selectable item in the menu. + * Highlight the first selectable item in the menu, if configured. * * @private * @chainable */ OO.ui.mixin.LookupElement.prototype.initializeLookupMenuSelection = function () { - if ( !this.lookupMenu.getSelectedItem() ) { + if ( this.lookupHighlightFirstItem && !this.lookupMenu.getSelectedItem() ) { this.lookupMenu.highlightItem( this.lookupMenu.getFirstSelectableItem() ); } }; @@ -13223,7 +13226,7 @@ OO.ui.ToggleButtonWidget.prototype.setButtonElement = function ( $button ) { }; /** - * CapsuleMultiSelectWidgets are something like a {@link OO.ui.ComboBoxWidget combo box widget} + * CapsuleMultiSelectWidgets are something like a {@link OO.ui.ComboBoxInputWidget combo box widget} * that allows for selecting multiple values. * * For more information about menus and options, please see the [OOjs UI documentation on MediaWiki][1]. @@ -16397,7 +16400,7 @@ OO.ui.TextInputWidget.prototype.restorePreInfuseState = function ( state ) { }; /** - * ComboBoxWidgets combine a {@link OO.ui.TextInputWidget text input} (where a value + * ComboBoxInputWidgets combine a {@link OO.ui.TextInputWidget text input} (where a value * can be entered manually) and a {@link OO.ui.MenuSelectWidget menu of options} (from which * a value can be chosen instead). Users can choose options from the combo box in one of two ways: * @@ -16406,13 +16409,15 @@ OO.ui.TextInputWidget.prototype.restorePreInfuseState = function ( state ) { * - by choosing a value from the menu. The value of the chosen option will then appear in the text * input field. * + * This widget can be used inside a HTML form, such as a OO.ui.FormLayout. + * * For more information about menus and options, please see the [OOjs UI documentation on MediaWiki][1]. * * @example - * // Example: A ComboBoxWidget. - * var comboBox = new OO.ui.ComboBoxWidget( { - * label: 'ComboBoxWidget', - * input: { value: 'Option One' }, + * // Example: A ComboBoxInputWidget. + * var comboBox = new OO.ui.ComboBoxInputWidget( { + * label: 'ComboBoxInputWidget', + * value: 'Option 1', * menu: { * items: [ * new OO.ui.MenuOptionWidget( { @@ -16443,60 +16448,47 @@ OO.ui.TextInputWidget.prototype.restorePreInfuseState = function ( state ) { * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options * * @class - * @extends OO.ui.Widget - * @mixins OO.ui.mixin.TabIndexedElement + * @extends OO.ui.TextInputWidget * * @constructor * @param {Object} [config] Configuration options + * @cfg {Object[]} [options=[]] Array of menu options in the format `{ data: …, label: … }` * @cfg {Object} [menu] Configuration options to pass to the {@link OO.ui.FloatingMenuSelectWidget menu select widget}. - * @cfg {Object} [input] Configuration options to pass to the {@link OO.ui.TextInputWidget text input widget}. * @cfg {jQuery} [$overlay] Render the menu into a separate layer. This configuration is useful in cases where * the expanded menu is larger than its containing `
`. The specified overlay layer is usually on top of the * containing `
` and has a larger area. By default, the menu uses relative positioning. */ -OO.ui.ComboBoxWidget = function OoUiComboBoxWidget( config ) { +OO.ui.ComboBoxInputWidget = function OoUiComboBoxInputWidget( config ) { // Configuration initialization - config = config || {}; + config = $.extend( { + indicator: 'down' + }, config ); + // For backwards-compatibility with ComboBoxWidget config + $.extend( config, config.input ); // Parent constructor - OO.ui.ComboBoxWidget.parent.call( this, config ); - - // Properties (must be set before TabIndexedElement constructor call) - this.$indicator = this.$( '' ); - - // Mixin constructors - OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$indicator } ) ); + OO.ui.ComboBoxInputWidget.parent.call( this, config ); // Properties this.$overlay = config.$overlay || this.$element; - this.input = new OO.ui.TextInputWidget( $.extend( - { - indicator: 'down', - $indicator: this.$indicator, - disabled: this.isDisabled() - }, - config.input - ) ); - this.input.$input.eq( 0 ).attr( { - role: 'combobox', - 'aria-autocomplete': 'list' - } ); this.menu = new OO.ui.FloatingMenuSelectWidget( $.extend( { widget: this, - input: this.input, - $container: this.input.$element, + input: this, + $container: this.$element, disabled: this.isDisabled() }, config.menu ) ); + // For backwards-compatibility with ComboBoxWidget + this.input = this; // Events this.$indicator.on( { - click: this.onClick.bind( this ), - keypress: this.onKeyPress.bind( this ) + click: this.onIndicatorClick.bind( this ), + keypress: this.onIndicatorKeyPress.bind( this ) } ); - this.input.connect( this, { + this.connect( this, { change: 'onInputChange', enter: 'onInputEnter' } ); @@ -16507,15 +16499,23 @@ OO.ui.ComboBoxWidget = function OoUiComboBoxWidget( config ) { } ); // Initialization - this.$element.addClass( 'oo-ui-comboBoxWidget' ).append( this.input.$element ); + this.$input.attr( { + role: 'combobox', + 'aria-autocomplete': 'list' + } ); + // Do not override options set via config.menu.items + if ( config.options !== undefined ) { + this.setOptions( config.options ); + } + // Extra class for backwards-compatibility with ComboBoxWidget + this.$element.addClass( 'oo-ui-comboBoxInputWidget oo-ui-comboBoxWidget' ); this.$overlay.append( this.menu.$element ); this.onMenuItemsChange(); }; /* Setup */ -OO.inheritClass( OO.ui.ComboBoxWidget, OO.ui.Widget ); -OO.mixinClass( OO.ui.ComboBoxWidget, OO.ui.mixin.TabIndexedElement ); +OO.inheritClass( OO.ui.ComboBoxInputWidget, OO.ui.TextInputWidget ); /* Methods */ @@ -16523,7 +16523,7 @@ OO.mixinClass( OO.ui.ComboBoxWidget, OO.ui.mixin.TabIndexedElement ); * Get the combobox's menu. * @return {OO.ui.FloatingMenuSelectWidget} Menu widget */ -OO.ui.ComboBoxWidget.prototype.getMenu = function () { +OO.ui.ComboBoxInputWidget.prototype.getMenu = function () { return this.menu; }; @@ -16531,8 +16531,8 @@ OO.ui.ComboBoxWidget.prototype.getMenu = function () { * Get the combobox's text input widget. * @return {OO.ui.TextInputWidget} Text input widget */ -OO.ui.ComboBoxWidget.prototype.getInput = function () { - return this.input; +OO.ui.ComboBoxInputWidget.prototype.getInput = function () { + return this; }; /** @@ -16541,7 +16541,7 @@ OO.ui.ComboBoxWidget.prototype.getInput = function () { * @private * @param {string} value New value */ -OO.ui.ComboBoxWidget.prototype.onInputChange = function ( value ) { +OO.ui.ComboBoxInputWidget.prototype.onInputChange = function ( value ) { var match = this.menu.getItemFromData( value ); this.menu.selectItem( match ); @@ -16560,10 +16560,10 @@ OO.ui.ComboBoxWidget.prototype.onInputChange = function ( value ) { * @private * @param {jQuery.Event} e Mouse click event */ -OO.ui.ComboBoxWidget.prototype.onClick = function ( e ) { +OO.ui.ComboBoxInputWidget.prototype.onIndicatorClick = function ( e ) { if ( !this.isDisabled() && e.which === 1 ) { this.menu.toggle(); - this.input.$input[ 0 ].focus(); + this.$input[ 0 ].focus(); } return false; }; @@ -16574,10 +16574,10 @@ OO.ui.ComboBoxWidget.prototype.onClick = function ( e ) { * @private * @param {jQuery.Event} e Key press event */ -OO.ui.ComboBoxWidget.prototype.onKeyPress = function ( e ) { +OO.ui.ComboBoxInputWidget.prototype.onIndicatorKeyPress = function ( e ) { if ( !this.isDisabled() && ( e.which === OO.ui.Keys.SPACE || e.which === OO.ui.Keys.ENTER ) ) { this.menu.toggle(); - this.input.$input[ 0 ].focus(); + this.$input[ 0 ].focus(); return false; } }; @@ -16587,7 +16587,7 @@ OO.ui.ComboBoxWidget.prototype.onKeyPress = function ( e ) { * * @private */ -OO.ui.ComboBoxWidget.prototype.onInputEnter = function () { +OO.ui.ComboBoxInputWidget.prototype.onInputEnter = function () { if ( !this.isDisabled() ) { this.menu.toggle( false ); } @@ -16599,8 +16599,8 @@ OO.ui.ComboBoxWidget.prototype.onInputEnter = function () { * @private * @param {OO.ui.OptionWidget} item Chosen item */ -OO.ui.ComboBoxWidget.prototype.onMenuChoose = function ( item ) { - this.input.setValue( item.getData() ); +OO.ui.ComboBoxInputWidget.prototype.onMenuChoose = function ( item ) { + this.setValue( item.getData() ); }; /** @@ -16608,25 +16608,22 @@ OO.ui.ComboBoxWidget.prototype.onMenuChoose = function ( item ) { * * @private */ -OO.ui.ComboBoxWidget.prototype.onMenuItemsChange = function () { - var match = this.menu.getItemFromData( this.input.getValue() ); +OO.ui.ComboBoxInputWidget.prototype.onMenuItemsChange = function () { + var match = this.menu.getItemFromData( this.getValue() ); this.menu.selectItem( match ); if ( this.menu.getHighlightedItem() ) { this.menu.highlightItem( match ); } - this.$element.toggleClass( 'oo-ui-comboBoxWidget-empty', this.menu.isEmpty() ); + this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-empty', this.menu.isEmpty() ); }; /** * @inheritdoc */ -OO.ui.ComboBoxWidget.prototype.setDisabled = function ( disabled ) { +OO.ui.ComboBoxInputWidget.prototype.setDisabled = function ( disabled ) { // Parent method - OO.ui.ComboBoxWidget.parent.prototype.setDisabled.call( this, disabled ); + OO.ui.ComboBoxInputWidget.parent.prototype.setDisabled.call( this, disabled ); - if ( this.input ) { - this.input.setDisabled( this.isDisabled() ); - } if ( this.menu ) { this.menu.setDisabled( this.isDisabled() ); } @@ -16634,6 +16631,31 @@ OO.ui.ComboBoxWidget.prototype.setDisabled = function ( disabled ) { return this; }; +/** + * Set the options available for this input. + * + * @param {Object[]} options Array of menu options in the format `{ data: …, label: … }` + * @chainable + */ +OO.ui.ComboBoxInputWidget.prototype.setOptions = function ( options ) { + this.getMenu() + .clearItems() + .addItems( options.map( function ( opt ) { + return new OO.ui.MenuOptionWidget( { + data: opt.data, + label: opt.label !== undefined ? opt.label : opt.data + } ); + } ) ); + + return this; +}; + +/** + * @class + * @deprecated Use OO.ui.ComboBoxInputWidget instead. + */ +OO.ui.ComboBoxWidget = OO.ui.ComboBoxInputWidget; + /** * LabelWidgets help identify the function of interface elements. Each LabelWidget can * be configured with a `label` option that is set to a string, a label node, or a function: @@ -18962,7 +18984,7 @@ OO.mixinClass( OO.ui.RadioSelectWidget, OO.ui.mixin.TabIndexedElement ); /** * MenuSelectWidget is a {@link OO.ui.SelectWidget select widget} that contains options and * is used together with OO.ui.MenuOptionWidget. It is designed be used as part of another widget. - * See {@link OO.ui.DropdownWidget DropdownWidget}, {@link OO.ui.ComboBoxWidget ComboBoxWidget}, + * See {@link OO.ui.DropdownWidget DropdownWidget}, {@link OO.ui.ComboBoxInputWidget ComboBoxInputWidget}, * and {@link OO.ui.mixin.LookupElement LookupElement} for examples of widgets that contain menus. * MenuSelectWidgets themselves are not instantiated directly, rather subclassed * and customized to be opened, closed, and displayed as needed. @@ -18987,7 +19009,7 @@ OO.mixinClass( OO.ui.RadioSelectWidget, OO.ui.mixin.TabIndexedElement ); * @constructor * @param {Object} [config] Configuration options * @cfg {OO.ui.TextInputWidget} [input] Text input used to implement option highlighting for menu items that match - * the text the user types. This config is used by {@link OO.ui.ComboBoxWidget ComboBoxWidget} + * the text the user types. This config is used by {@link OO.ui.ComboBoxInputWidget ComboBoxInputWidget} * and {@link OO.ui.mixin.LookupElement LookupElement} * @cfg {jQuery} [$input] Text input used to implement option highlighting for menu items that match * the text the user types. This config is used by {@link OO.ui.CapsuleMultiSelectWidget CapsuleMultiSelectWidget} @@ -19276,7 +19298,7 @@ OO.ui.MenuSelectWidget.prototype.toggle = function ( visible ) { * The menu's position is automatically calculated and maintained when the menu * is toggled or the window is resized. * - * See OO.ui.ComboBoxWidget for an example of a widget that uses this class. + * See OO.ui.ComboBoxInputWidget for an example of a widget that uses this class. * * @class * @extends OO.ui.MenuSelectWidget diff --git a/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json b/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json index f7b38628bc..a6abce5df7 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json +++ b/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json @@ -13,7 +13,7 @@ "ltr": "images/icons/find-ltr.svg", "rtl": "images/icons/find-rtl.svg" } }, - "insert": { "file": "images/icons/insert.svg" }, + "insert": { "file": "images/icons/add.svg" }, "layout": { "file": { "ltr": "images/icons/layout-ltr.svg", "rtl": "images/icons/layout-rtl.svg" diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/add.png b/resources/lib/oojs-ui/themes/apex/images/icons/add.png index 730d1029a479f5294361a64ae8329761e64e6b41..c0d04e90358544b257c994ba9fa0b49b69daf8ff 100644 GIT binary patch delta 79 zcmbQhIFWIJr-!kpi(`mKXL5oB>*9uc59~#Rd1quinGnd`!QNBx#G}h6Chg)K_9aah gQ><8YL28N^82lMo1)^TConZh1Pgg&ebxsLQ0Cu_?T>t<8 delta 78 zcmbQpIDv73r@N7-i(`mKXL5oB>*55F30(i24KFryy74WX&)Va%LQzDe;_QN*{2r{z h29w+mYDlp1@GvY8XXV)9m|VpG1fH&bF6*2UngIK$7<>Q# diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/add.svg b/resources/lib/oojs-ui/themes/apex/images/icons/add.svg index 85e39febb2..62e54965e4 100644 --- a/resources/lib/oojs-ui/themes/apex/images/icons/add.svg +++ b/resources/lib/oojs-ui/themes/apex/images/icons/add.svg @@ -1,6 +1,6 @@ - + diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/insert.png b/resources/lib/oojs-ui/themes/apex/images/icons/insert.png deleted file mode 100644 index 97927a84a9c43152c4698fa6272f4bf3601819e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf4nJ za0`PlBg3pYARR`YE{-7{oyiFjtcw|V|FkD9VifL`G0Hlqu&F_?-NI9ob$+GEcgB?o hCh|Q|23&3`3=C>ztRl8vk%>Uv44$rjF6*2Ung9~{Ag2HT diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/insert.svg b/resources/lib/oojs-ui/themes/apex/images/icons/insert.svg deleted file mode 100644 index d1e9ba3379..0000000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/insert.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-ltr.png index 8b15525d350c7a09852046cfa0a6a186c8531b9f..875958b09ec48092712c40bbd4ec602e62f9df3a 100644 GIT binary patch delta 166 zcmV;X09pU)0p|gbNq>n+L_t(YiS5);3xFUD1mF?h#-%Ez9WPNAcVRD51|195Gvpy zx|o-9ra7?>m!XFf-LgvTOtt}pq^=6Dqgg|AoXwsA%J!K=qaPBxyZ8v}7a8!uTwl3) UB{4ye4*&oF07*qoM6N<$f;pZ@asU7T delta 169 zcmV;a09OC!0qOyeNq>w3IagiiFCFIK~cB*yHhhC(2x><4@KFe#KYZU6qyEi%|l864=LM$g_Ho` zAZ37slmZ%pO3(A$DV0EIa1-~#gty8DXI^~z*Uz3^OF-o8S|SP!MZfKf$joOt0^ZF9 XhP#;rLY)*n00000NkvXXu0mjfuINi! diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-ltr.svg index e0e4fc0150..22c04ca8ca 100644 --- a/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-ltr.svg +++ b/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-ltr.svg @@ -1,6 +1,6 @@ - - + + diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-rtl.png index f7bab3840f18d6f1eb217ba4cc1af7304bfea673..6ebb399f0d50cd773799793072f302bf0470d7f3 100644 GIT binary patch delta 164 zcmV;V09*g$0p$UZNq>h)L_t(YiS3oa3V<*SLxVqV{c^onsFHQvh=^cdhq3TpPaW{* zh1huj0LugLH7o4lusiEofVaBS0tPP$T6Y$QM~O@j;iZ8_1V-Lvf(Vxj9B#$_kRZaV z19b%syTc`d3@#C5aETy;PYWF8@ZK(}td+~e3@#HyxaGCE$Q|MA!`YOA@8e(L_t(YiS3m^3cw%?1f?Hu`f__Q#fHQfvmOdv5Fsoxo?ELeEQ1Op94a8A0}=FaxPakgbW(yI z9(veJQNkethH3D$z=Nj+9(+kKyIZ2GCA?e0f<6qVQE4^bgB;5*^Fj-@=LS5!pm~BW Rs1*PJ002ovPDHLkV1l^1Lqh-n diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-rtl.svg index a7be5abee8..d717265745 100644 --- a/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-rtl.svg +++ b/resources/lib/oojs-ui/themes/apex/images/icons/noWikiText-rtl.svg @@ -1,6 +1,6 @@ - - + + diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/wikiText.png b/resources/lib/oojs-ui/themes/apex/images/icons/wikiText.png index 4b15161cfbd064b22a4d436b2486deb755b75d3d..850f15768b7f15cd2965548c03fb3ed58d9eaba6 100644 GIT binary patch delta 90 zcmV-g0Hyz<0h|GlNmD*aL_t(YiDO_G1;ZXNqVfNu$)WQ}R?9?*>xcokEI@ZHI-giI w1LuQL3q~y%wE(qT!Nw<64efm}3Pu0`0DrXz9D1^>!2kdN07*qoM6N<$f>}->^8f$< delta 97 zcmV-n0G|Jx0iywsNm@loL_t(YiDO_G1;ZXNBC-Etk;5iNl6ofc-9{W>!6L>;qS$|Y zVl?-`s0E`Ij9P#_C&O|fwsHqwS%g)L<~|q&BLDyZ(M1X%If1|+00000NkvXXu0mjf DQ8*+F diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/wikiText.svg b/resources/lib/oojs-ui/themes/apex/images/icons/wikiText.svg index ded0fe1ae9..4512cf5686 100644 --- a/resources/lib/oojs-ui/themes/apex/images/icons/wikiText.svg +++ b/resources/lib/oojs-ui/themes/apex/images/icons/wikiText.svg @@ -1,15 +1,9 @@ - - - - - - - - - - - + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json index ef368c23fc..d981728d0c 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json @@ -19,7 +19,7 @@ "ltr": "images/icons/find-ltr.svg", "rtl": "images/icons/find-rtl.svg" } }, - "insert": { "file": "images/icons/insert.svg" }, + "insert": { "file": "images/icons/add.svg" }, "layout": { "file": { "ltr": "images/icons/layout-ltr.svg", "rtl": "images/icons/layout-rtl.svg" diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.png index c65a5c1e37eb08c397eed40a32ea07919dd30726..e81206c449c74715e8895ea6dfa371d006c12a36 100644 GIT binary patch delta 87 zcmbQiIFoULXMnY*i(`mKXL5oB>*9ue3ANAb+rG~I?|Jc%i}v=OCQ rl1;mx*(vb$s9jdfJg6bTI)#~GtrYi%i^<#k8Gyjk)z4*}Q$iB}{cs^M delta 86 zcmbQqID>J5r@xh_i(`mKXL5oB>*55F32fKO|D{LV|2bbo*Jn!+_g$R?l@(0^6IiA_ oHf?@pr@-5D!b1+E(7=F!LGd8>i@f8x%NT&b)78&qol`;+0E(+0w*UYD diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg index ef2ac5c016..dab0beaad2 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg @@ -1,6 +1,6 @@ - + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.png index d6144e3dcb160ae86e53686b0bc3b99f57d236a5..34a293fa444b0fbb9519dc69121935a9dd9360b0 100644 GIT binary patch delta 70 zcmbQjIE8USsC~n_2lgTp7PWVV^+|4R$T-m9-E`$dN=nL+EU~k-4nh*X%bYJa1sZT^ ZurpYNim+_76aC5n1fH&bF6*2Ung9mh8aMy| delta 70 zcmbQjIE8USsC|OS1eSl!jG9$5GM-B8iag-q!MIQ%F(u_lHrv@+2O)`>6K%NM4r(MM aFfhEnBmC$1=e4^SfWXt$&t;ucLK6U~?;5xO diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg index 2ad5f6019f..35322d00dd 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg @@ -1,6 +1,6 @@ - + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add.png index 730d1029a479f5294361a64ae8329761e64e6b41..c0d04e90358544b257c994ba9fa0b49b69daf8ff 100644 GIT binary patch delta 79 zcmbQhIFWIJr-!kpi(`mKXL5oB>*9uc59~#Rd1quinGnd`!QNBx#G}h6Chg)K_9aah gQ><8YL28N^82lMo1)^TConZh1Pgg&ebxsLQ0Cu_?T>t<8 delta 78 zcmbQpIDv73r@N7-i(`mKXL5oB>*55F30(i24KFryy74WX&)Va%LQzDe;_QN*{2r{z h29w+mYDlp1@GvY8XXV)9m|VpG1fH&bF6*2UngIK$7<>Q# diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add.svg index 85e39febb2..62e54965e4 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add.svg @@ -1,6 +1,6 @@ - + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert-invert.png deleted file mode 100644 index dd08bc2a48e30d712d38c24ecb1085d43db7a002..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf4nJ za0`PlBg3pYART6&E{-7{oyiFjtcw{W|Fkm&eKELr%5bq5j~uteM$SpIf*!OP8YRte nFP5Lc;`aIA3f9F5OPClEyF@tVNH?bdObP0l+XkK4~iv+ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert-invert.svg deleted file mode 100644 index 54b8ffd7c2..0000000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert-invert.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert.png deleted file mode 100644 index 97927a84a9c43152c4698fa6272f4bf3601819e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf4nJ za0`PlBg3pYARR`YE{-7{oyiFjtcw|V|FkD9VifL`G0Hlqu&F_?-NI9ob$+GEcgB?o hCh|Q|23&3`3=C>ztRl8vk%>Uv44$rjF6*2Ung9~{Ag2HT diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert.svg deleted file mode 100644 index d1e9ba3379..0000000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/insert.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.png index 72bbf3478ed26d277bb6e8781a4348428e352f95..0400c192d2b6016190081eb2b8230bb5c1fcc4cb 100644 GIT binary patch delta 119 zcmV--0Eqwg0l5K?NpM?9L_t(YiS3cW4S+BV0~_|A3n*eG+YCTdNIs|{_l&C3scxJwk#tT!a*xVu3eM^sL7%S08$ ZGZ((G$dt|1FmM0>002ovPDHLkV1hhOG|K=0 delta 181 zcmV;m080P40rmlqNq?A0L_t(YiS3k24#GeTLt_U{!{;)9xFp;K1h=6{*u$XKWr0-s zmR{J_SQ)dK$%B@dnL7X*#i*)oB+r8aBH}@Ep#)@R=kCi_or*~h)e@U60UXV2tGJWA zj41UzpGMvTSSv>A$Q?;n0@RV4gZ1!FBUjbI%vOp~RozLR1}+6eM39t@Ff+s5-=6%Z jBTJthfa{1-GgIIRan?C2iZBSF00000NkvXXu0mjf=MhoL diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg index 3bda245079..1081b4c244 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg @@ -1,6 +1,6 @@ - + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.png index 45daeab428dbab3ff03bd7b30867b1e3f7c4797a..0a781199fc856f53c63d33a3eddad44540ae57dc 100644 GIT binary patch delta 106 zcmcb`xQ20pXR@ECi(`mKXL5oBtFqXfl!SyI{z`U@XBFIJ#QvyXPLz0N_%NX3swv9> zL!&P|i3M$mE8IVM8u7^YrZh=pZ{UkinXh#C!{d|}lB|mxI2ai6=Nb5=>^hyp00f?{ KelF{r5}E*SUnmIx delta 153 zcmV;K0A~NJ0onnONq>AvL_t(YiS3lj34kyZ1jk=BewtCSN$o|^ZcNa-B$@?5Q0Mq~ z?1l^p{JfsXGp~VC%$k8Av|t5NvA_V?aTtpsXKb#a@01--i3Ov$e-Azf4N!<#l4JuU zVu2*tDeQueNp68$%vyjxw7{Z2LW|?dAC;_rc9XdO^A>iYi4qkPzKlgf00000NkvXX Hu0mjfufjtm diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg index b84ab8662b..ce25178aa5 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg @@ -1,6 +1,6 @@ - + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr-invert.png index dcd35ceadb1d34fb5c4ec1fda8cee6a0bd97e1e8..39e00b100dc4a8bf1bde651bff919250049603cd 100644 GIT binary patch delta 174 zcmV;f08#()0q+5jNq><^L_t(YiS3fX5`Z8GM78O^<R~ z6-W|PPgoMHs!brqNVz`&;I$3w$kt4T1)9VxV8KFb!WrUHz9;Th1|7ySv7%-2ip1-R c=3UR{Z05ZfuEy6)dH?_b07*qoM6N<$f*A!-+5i9m delta 177 zcmV;i08an!0rCNmNq>|{L_t(YiQUq{4gw(zMbTpX@9CdkH={x1m5wP3eJf}vCncEu zMF0nU$KAJXee6Qa>@@}35Z>bh3P5lkRg(=fqy!i)_3Y%U+D9>qd=2!q2&n=jQZ|7? zN`P}cMalq$lmav4xmSI6yO`FRpS=gr@8hIL6_YIc7@}(8yebc9IWR@m@0LvTT)&T8 f{-#mVU$!z2ow%MP*;i`700000NkvXXu0mjf(|=G1 diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr-invert.svg index 770932b8b2..e82e1682ce 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr-invert.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr-invert.svg @@ -1,6 +1,6 @@ - - + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr.png index 8b15525d350c7a09852046cfa0a6a186c8531b9f..875958b09ec48092712c40bbd4ec602e62f9df3a 100644 GIT binary patch delta 166 zcmV;X09pU)0p|gbNq>n+L_t(YiS5);3xFUD1mF?h#-%Ez9WPNAcVRD51|195Gvpy zx|o-9ra7?>m!XFf-LgvTOtt}pq^=6Dqgg|AoXwsA%J!K=qaPBxyZ8v}7a8!uTwl3) UB{4ye4*&oF07*qoM6N<$f;pZ@asU7T delta 169 zcmV;a09OC!0qOyeNq>w3IagiiFCFIK~cB*yHhhC(2x><4@KFe#KYZU6qyEi%|l864=LM$g_Ho` zAZ37slmZ%pO3(A$DV0EIa1-~#gty8DXI^~z*Uz3^OF-o8S|SP!MZfKf$joOt0^ZF9 XhP#;rLY)*n00000NkvXXu0mjfuINi! diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr.svg index e0e4fc0150..22c04ca8ca 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-ltr.svg @@ -1,6 +1,6 @@ - - + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl-invert.png index eda918c980aea08b2ba94ec8c3e090b8377e5216..6cd62a121c0eb3ce649f12b6607d0bae374689ea 100644 GIT binary patch delta 167 zcmV;Y09gO&0q6mcNq>q-L_t(YiS3m^4uCKS1gRevUrtXowE|*UO-$rQTxKX2iT--K zM1)0zTfd;;M6`N=y|muQa<{pf%?M8LkihDVnFf!)AS&qLp@r@Uw2ff`>*f%Fck{I1 z>gKb820Oq}0uv4qcyQPYEOt;L_t(YiS3m^4uBvG1Q$PUeR(|?4c1n~E(a6$SYU>1LID0a zQB_e@0f1=)9Kg)x9&p_vcHxw07VH-TzwFNlTzDvG&7Rak6<9b`P}kBt*DJ7{Qw4P` zbb;-hDzI>tV85yRLbHNfcv{eczY+wsgphj8n|TLZcv{d?OCc(sgxfE3DWy;a!?Oav W%C~_mheI0x0000 - - + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl.png index f7bab3840f18d6f1eb217ba4cc1af7304bfea673..6ebb399f0d50cd773799793072f302bf0470d7f3 100644 GIT binary patch delta 164 zcmV;V09*g$0p$UZNq>h)L_t(YiS3oa3V<*SLxVqV{c^onsFHQvh=^cdhq3TpPaW{* zh1huj0LugLH7o4lusiEofVaBS0tPP$T6Y$QM~O@j;iZ8_1V-Lvf(Vxj9B#$_kRZaV z19b%syTc`d3@#C5aETy;PYWF8@ZK(}td+~e3@#HyxaGCE$Q|MA!`YOA@8e(L_t(YiS3m^3cw%?1f?Hu`f__Q#fHQfvmOdv5Fsoxo?ELeEQ1Op94a8A0}=FaxPakgbW(yI z9(veJQNkethH3D$z=Nj+9(+kKyIZ2GCA?e0f<6qVQE4^bgB;5*^Fj-@=LS5!pm~BW Rs1*PJ002ovPDHLkV1l^1Lqh-n diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl.svg index a7be5abee8..d717265745 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/noWikiText-rtl.svg @@ -1,6 +1,6 @@ - - + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText-invert.png index bdf5238ea4d3f58091d9a17365d399208241e1df..5e53c45fe49a6828b483f1a28baa7a3aa3cd8437 100644 GIT binary patch delta 99 zcmV-p0G$7;0i^+uNnA%sL_t(YiS3jz3IH$&1GWGEbGj7?3br_v+!hR6Ce6h6cnkn= z4(`tRrMspVGpT^ra_)9Y!6Xt$AVDFBe002ovPDHLk FV1m%;CtLsk delta 105 zcmZ3=xSDZ-XOgd{i(`mKXL5oB>tQ*ALlXaipkL|Wi4z^ZJt1Fxu9WJlB{+&Zl&Kmf zomh8F&8=9zC(0n};0o4=A|oB~B<=DKQ(bo)$#~ZsXu!n4u$@aoA diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText-invert.svg index e050baa359..ec12d0e6bc 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText-invert.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText-invert.svg @@ -1,15 +1,9 @@ - - - - - - - - - - - + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText.png index 4b15161cfbd064b22a4d436b2486deb755b75d3d..850f15768b7f15cd2965548c03fb3ed58d9eaba6 100644 GIT binary patch delta 90 zcmV-g0Hyz<0h|GlNmD*aL_t(YiDO_G1;ZXNqVfNu$)WQ}R?9?*>xcokEI@ZHI-giI w1LuQL3q~y%wE(qT!Nw<64efm}3Pu0`0DrXz9D1^>!2kdN07*qoM6N<$f>}->^8f$< delta 97 zcmV-n0G|Jx0iywsNm@loL_t(YiDO_G1;ZXNBC-Etk;5iNl6ofc-9{W>!6L>;qS$|Y zVl?-`s0E`Ij9P#_C&O|fwsHqwS%g)L<~|q&BLDyZ(M1X%If1|+00000NkvXXu0mjf DQ8*+F diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText.svg index ded0fe1ae9..4512cf5686 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/wikiText.svg @@ -1,15 +1,9 @@ - - - - - - - - - - - + + + + + -- 2.20.1