[MediaWiki-commits] [Gerrit] oojs/core[master]: docs: use JSDoc3 instead of jsduck
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405544 ) Change subject: docs: use JSDoc3 instead of jsduck .. docs: use JSDoc3 instead of jsduck Change-Id: I85d8cbfc1873752d5938e167eacefa177e7a4396 --- A jsdoc.json D jsduck.categories.json D jsduck.json M package.json M src/EmitterList.js M src/EventEmitter.js M src/Registry.js M src/SortedEmitterList.js 8 files changed, 36 insertions(+), 60 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/44/405544/1 diff --git a/jsdoc.json b/jsdoc.json new file mode 100644 index 000..240d3c0 --- /dev/null +++ b/jsdoc.json @@ -0,0 +1,16 @@ +{ + "source": { + "include": [ "src/" ] + }, + "plugins": [ + "plugins/markdown" + ], + "opts": { + "source": "src/**/*.js", + "tutorials": "", + "recurse": true, + "readme": "README.md", + "package": "package.json", + "destination": "docs/" + } +} diff --git a/jsduck.categories.json b/jsduck.categories.json deleted file mode 100644 index 3bae581..000 --- a/jsduck.categories.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "name": "OOjs", - "groups": [ - { - "name": "OO", - "classes": [ - "OO", - "OO.*" - ] - } - ] - }, - { - "name": "Upstream", - "groups": [ - { - "name": "JavaScript", - "classes": [ - "Array", - "Boolean", - "Date", - "Function", - "Number", - "Object", - "RegExp", - "String" - ] - } - ] - } -] diff --git a/jsduck.json b/jsduck.json deleted file mode 100644 index e5971ec..000 --- a/jsduck.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "--title": "OOjs - Documentation", - "--output": "docs", - "--categories": "./jsduck.categories.json", - "--processes": "0", - "--warnings-exit-nonzero": true, - "--builtin-classes": true, - "--": [ - "src/" - ] -} diff --git a/package.json b/package.json index 7e04192..013a111 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "filename": "oojs.min.js", "scripts": { "test": "grunt test && node tests/node-index.js", -"doc": "jsduck", +"doc": "jsdoc -c jsdoc.json", "prepublish": "grunt build" }, "dependencies": {}, @@ -34,6 +34,7 @@ "grunt-eslint": "20.0.0", "grunt-karma": "2.0.0", "jquery": "3.2.1", +"jsdoc": "^3.5.5", "karma": "1.5.0", "karma-chrome-launcher": "2.2.0", "karma-coverage": "1.1.1", diff --git a/src/EmitterList.js b/src/EmitterList.js index 29d5b7a..c3d02e3 100644 --- a/src/EmitterList.js +++ b/src/EmitterList.js @@ -21,7 +21,7 @@ /** * Item has been added * -* @event add +* @event oo.EmitterList#add * @param {OO.EventEmitter} item Added item * @param {number} index Index items were added at */ @@ -29,7 +29,7 @@ /** * Item has been moved to a new index * -* @event move +* @event oo.EmitterList#move * @param {OO.EventEmitter} item Moved item * @param {number} index Index item was moved to * @param {number} oldIndex The original index the item was in @@ -38,13 +38,15 @@ /** * Item has been removed * -* @event remove +* @event oo.EmitterList#remove * @param {OO.EventEmitter} item Removed item * @param {number} index Index the item was removed from */ /** -* @event clear The list has been cleared of items +* The list has been cleared of items +* +* @event oo.EmitterList#clear */ /* Methods */ @@ -166,8 +168,8 @@ * given, or if the index that is given is invalid, the item * will be added at the end of the list. * @chainable -* @fires add -* @fires move +* @fires oo.EmitterList#add +* @fires oo.EmitterList#move */ oo.EmitterList.prototype.addItems = function ( items, index ) { var i, oldIndex; @@ -280,7 +282,7 @@ * * @param {OO.EventEmitter[]}
[MediaWiki-commits] [Gerrit] oojs/ui[master]: wikimediaui: lightbulb icon: Fix centering
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401651 ) Change subject: wikimediaui: lightbulb icon: Fix centering .. wikimediaui: lightbulb icon: Fix centering Follows-up on I90fe58e79559b7e47a62af6b216098b49802b274 Bug: T175006 Change-Id: I5b5976973ecc09fecf8a9069dc382d8499afb5dd --- M src/themes/wikimediaui/images/icons/lightbulb.svg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/51/401651/1 diff --git a/src/themes/wikimediaui/images/icons/lightbulb.svg b/src/themes/wikimediaui/images/icons/lightbulb.svg index a4aa8f3..f50f256 100644 --- a/src/themes/wikimediaui/images/icons/lightbulb.svg +++ b/src/themes/wikimediaui/images/icons/lightbulb.svg @@ -1,5 +1,5 @@ -http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> +http://www.w3.org/2000/svg; width="20" height="20" viewBox="0 0 20 20"> -- To view, visit https://gerrit.wikimedia.org/r/401651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b5976973ecc09fecf8a9069dc382d8499afb5dd Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: docs: TagMultiselectWidget: Remove link to MediaWiki documen...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401423 ) Change subject: docs: TagMultiselectWidget: Remove link to MediaWiki documentation .. docs: TagMultiselectWidget: Remove link to MediaWiki documentation …as it has no details about this kind of widget Change-Id: I7ebc5bf6c88d670c1b1137ad52dfc1f6aeff3399 --- M src/widgets/MenuTagMultiselectWidget.js M src/widgets/PopupTagMultiselectWidget.js M src/widgets/TagMultiselectWidget.js 3 files changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/401423/1 diff --git a/src/widgets/MenuTagMultiselectWidget.js b/src/widgets/MenuTagMultiselectWidget.js index f5a87f3..97b4e2b 100644 --- a/src/widgets/MenuTagMultiselectWidget.js +++ b/src/widgets/MenuTagMultiselectWidget.js @@ -2,8 +2,6 @@ * MenuTagMultiselectWidget is a {@link OO.ui.TagMultiselectWidget OO.ui.TagMultiselectWidget} intended * to use a menu of selectable options. * - * For more information about menus and options, please see the [OOjs UI documentation on MediaWiki][1]. - * * @example * // Example: A basic MenuTagMultiselectWidget. * var widget = new OO.ui.MenuTagMultiselectWidget( { @@ -16,8 +14,6 @@ * selected: [ 'option1', 'option2' ] * } ); * $( 'body' ).append( widget.$element ); - * - * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options * * @class * @extends OO.ui.TagMultiselectWidget diff --git a/src/widgets/PopupTagMultiselectWidget.js b/src/widgets/PopupTagMultiselectWidget.js index 530bd25..8bd61a7 100644 --- a/src/widgets/PopupTagMultiselectWidget.js +++ b/src/widgets/PopupTagMultiselectWidget.js @@ -2,8 +2,6 @@ * PopupTagMultiselectWidget is a {@link OO.ui.TagMultiselectWidget OO.ui.TagMultiselectWidget} intended * to use a popup. The popup can be configured to have a default input to insert values into the widget. * - * For more information about menus and options, please see the [OOjs UI documentation on MediaWiki][1]. - * * @example * // Example: A basic PopupTagMultiselectWidget. * var widget = new OO.ui.PopupTagMultiselectWidget(); @@ -18,8 +16,6 @@ *} * } ); * $( 'body' ).append( widget.$element ); - * - * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options * * @class * @extends OO.ui.TagMultiselectWidget diff --git a/src/widgets/TagMultiselectWidget.js b/src/widgets/TagMultiselectWidget.js index 9cfeba2..b7d35d0 100644 --- a/src/widgets/TagMultiselectWidget.js +++ b/src/widgets/TagMultiselectWidget.js @@ -2,8 +2,6 @@ * A basic tag multiselect widget, similar in concept to {@link OO.ui.ComboBoxInputWidget combo box widget} * that allows the user to add multiple values that are displayed in a tag area. * - * For more information about menus and options, please see the [OOjs UI documentation on MediaWiki][1]. - * * This widget is a base widget; see {@link OO.ui.MenuTagMultiselectWidget MenuTagMultiselectWidget} and * {@link OO.ui.PopupTagMultiselectWidget PopupTagMultiselectWidget} for the implementations that use * a menu and a popup respectively. @@ -16,8 +14,6 @@ * selected: [ 'Option 1' ] * } ); * $( 'body' ).append( widget.$element ); - * - * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options * * @class * @extends OO.ui.Widget -- To view, visit https://gerrit.wikimedia.org/r/401423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ebc5bf6c88d670c1b1137ad52dfc1f6aeff3399 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuTagMultiselectWidget: Erase the input when a menu option...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401422 ) Change subject: MenuTagMultiselectWidget: Erase the input when a menu option is chosen .. MenuTagMultiselectWidget: Erase the input when a menu option is chosen Bug: T183378 Change-Id: I274d2518d798936692b3edbf1f28afde15642ffc --- M src/widgets/MenuTagMultiselectWidget.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/22/401422/1 diff --git a/src/widgets/MenuTagMultiselectWidget.js b/src/widgets/MenuTagMultiselectWidget.js index f5a87f3..144d7a1 100644 --- a/src/widgets/MenuTagMultiselectWidget.js +++ b/src/widgets/MenuTagMultiselectWidget.js @@ -112,6 +112,9 @@ OO.ui.MenuTagMultiselectWidget.prototype.onMenuChoose = function ( menuItem ) { // Add tag this.addTag( menuItem.getData(), menuItem.getLabel() ); + if ( this.hasInput ) { + this.input.setValue( '' ); + } }; /** -- To view, visit https://gerrit.wikimedia.org/r/401422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I274d2518d798936692b3edbf1f28afde15642ffc Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:ProtectedTitles: Use OOUI in HTMLForm
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401201 ) Change subject: Special:ProtectedTitles: Use OOUI in HTMLForm .. Special:ProtectedTitles: Use OOUI in HTMLForm Bug: T117723 Change-Id: Icd73fa43f237515c3eabf66d1d5f62171d8619ed --- M includes/specials/SpecialProtectedtitles.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/01/401201/1 diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index 8c69a96..7e4553b 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -133,7 +133,7 @@ 'levelmenu' => $this->getLevelMenu( $level ) ]; - $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() ); + $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() ); $htmlForm ->setMethod( 'get' ) ->setWrapperLegendMsg( 'protectedtitles' ) -- To view, visit https://gerrit.wikimedia.org/r/401201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd73fa43f237515c3eabf66d1d5f62171d8619ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:ProtectedTitles: Use HTMLForm
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401200 ) Change subject: Special:ProtectedTitles: Use HTMLForm .. Special:ProtectedTitles: Use HTMLForm Bug: T117723 Change-Id: Idbf924a2a0e6348a32ab48a0e39b812400a6c9af --- M includes/specials/SpecialProtectedtitles.php 1 file changed, 26 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/00/401200/1 diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index fa9033c..8c69a96 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -120,35 +120,26 @@ $title = $this->getPageTitle(); $special = htmlspecialchars( $title->getPrefixedDBkey() ); - return "\n" . - '' . - Xml::element( 'legend', [], $this->msg( 'protectedtitles' )->text() ) . - Html::hidden( 'title', $special ) . "\n" . - $this->getNamespaceMenu( $namespace ) . "\n" . - $this->getLevelMenu( $level ) . "\n" . - "" . Xml::submitButton( $this->msg( 'protectedtitles-submit' )->text() ) . "\n" . - ""; - } - - /** -* Prepare the namespace filter drop-down; standard namespace -* selector, sans the MediaWiki namespace -* -* @param string|null $namespace Pre-select namespace -* @return string -*/ - function getNamespaceMenu( $namespace = null ) { - return Html::namespaceSelector( - [ + $formDescriptor = [ + 'namespace' => [ + 'class' => 'HTMLSelectNamespace', + 'name' => 'namespace', + 'id' => 'namespace', + 'cssclass' => 'namespaceselector', 'selected' => $namespace, 'all' => '', 'label' => $this->msg( 'namespace' )->text() - ], [ - 'name' => 'namespace', - 'id' => 'namespace', - 'class' => 'namespaceselector', - ] - ); + ], + 'levelmenu' => $this->getLevelMenu( $level ) + ]; + + $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() ); + $htmlForm + ->setMethod( 'get' ) + ->setWrapperLegendMsg( 'protectedtitles' ) + ->setSubmitText( $this->msg( 'protectedtitles-submit' )->text() ); + + return $htmlForm->prepareForm()->getHTML( false ); } /** @@ -176,14 +167,17 @@ } // Third pass generates sorted XHTML content foreach ( $m as $text => $type ) { - $selected = ( $type == $pr_level ); - $options[] = Xml::option( $text, $type, $selected ); + $options[ $text ] = $type; } - return Xml::label( $this->msg( 'restriction-level' )->text(), $this->IdLevel ) . '' . - Xml::tags( 'select', - [ 'id' => $this->IdLevel, 'name' => $this->IdLevel ], - implode( "\n", $options ) ); + return [ + 'type' => 'select', + 'options' => $options, + 'value' => $pr_lever, + 'label' => $this->msg( 'restriction-level' )->text(), + 'name' => $this->IdLevel, + 'id' => $this->IdLevel + ]; } protected function getGroupName() { -- To view, visit https://gerrit.wikimedia.org/r/401200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbf924a2a0e6348a32ab48a0e39b812400a6c9af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [wip] mw.widgets: Add SizeFilterWidget and its PHP implement...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400627 ) Change subject: [wip] mw.widgets: Add SizeFilterWidget and its PHP implementation .. [wip] mw.widgets: Add SizeFilterWidget and its PHP implementation Bug: T183765 Change-Id: Ieb551e901405749489059366de9af6316f369cc0 --- M resources/Resources.php A resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.base.css A resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js 3 files changed, 141 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/27/400627/1 diff --git a/resources/Resources.php b/resources/Resources.php index 7d37b50..ea305f1 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2579,6 +2579,23 @@ 'styles' => 'resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.base.css', 'targets' => [ 'desktop', 'mobile' ], ], + 'mediawiki.widgets.SizeFilterWidget' => [ + 'scripts' => 'resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js', + 'dependencies' => [ + 'mediawiki.widgets.SizeFilterWidget.styles', + 'oojs-ui-widgets', + ], + 'messages' => [ + 'minimum-size', + 'maximum-size', + 'pagesize', + ], + 'targets' => [ 'desktop', 'mobile' ], + ], + 'mediawiki.widgets.SizeFilterWidget.styles' => [ + 'styles' => 'resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.base.css', + 'targets' => [ 'desktop', 'mobile' ], + ], 'mediawiki.widgets.MediaSearch' => [ 'scripts' => [ 'resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js', diff --git a/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.base.css b/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.base.css new file mode 100644 index 000..b85ed2d --- /dev/null +++ b/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.base.css @@ -0,0 +1,15 @@ +/*! + * MediaWiki Widgets - base SelectWithInput styles. + * + * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +.mw-widget-sizeFilterWidget .oo-ui-buttonSelectWidget, +.mw-widget-sizeFilterWidget .oo-ui-textInputWidget { + display: inline-block; +} + +.mw-widget-sizeFilterWidget .oo-ui-textInputWidget { + max-width: 29.5em; +} diff --git a/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js b/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js new file mode 100644 index 000..331c7f8 --- /dev/null +++ b/resources/src/mediawiki.widgets/mw.widgets.SizeFilterWidget.js @@ -0,0 +1,109 @@ +/*! + * MediaWiki Widgets - SizeFilterWidget class. + * + * @copyright 2011-2017 MediaWiki Widgets Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ +( function ( $, mw ) { + + /** +* ButtonSelectWidget and a TextInputWidget to set minimum or maximum byte size +* +* mw.loader.using( 'mediawiki.widgets.SizeFilterWidget', function () { +* var sf = new mw.widgets.SizeFilterWidget(); +* $( 'body' ).append( sf.$element ); +* } ); +* +* @class mw.widgets.SizeFilterWidget +* @extends OO.ui.Widget +* @uses OO.ui.ButtonSelectWidget +* @uses OO.ui.TextInputWidget +* +* @constructor +* @param {Object} [config] Configuration options +*/ + mw.widgets.SizeFilterWidget = function MwWidgetsSizeFilterWidget( config ) { + // Properties + this.buttonselect = new OO.ui.ButtonSelectWidget( { items: [ + // TODO select one option + new OO.ui.ButtonOptionWidget( { data: 'min', label: mw.msg( 'minimum-size' ) } ), + new OO.ui.ButtonOptionWidget( { data: 'max', label: mw.msg( 'maximum-size' ) } ), + ] } ); + this.textinput = new OO.ui.TextInputWidget( { + type: 'number', + placeholder: mw.msg( 'pagesize' ) + } ); + + // Parent constructor + mw.widgets.SizeFilterWidget.parent.call( this, config ); + + // Initialization + this.$element + .addClass( 'mw-widget-sizeFilterWidget' ) + .append( + this.buttonselect.$element, + this.textinput.$element, + ); + }; + + /* Setup */ + OO.inheritClass( mw.widgets.SizeFilterWidget,
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:ProtectedPages: Add fields directly in $formDescriptor
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400626 ) Change subject: Special:ProtectedPages: Add fields directly in $formDescriptor .. Special:ProtectedPages: Add fields directly in $formDescriptor …instead of having separate functions. Change-Id: Ife9ca83b97b24e4372d1b43b0eea41c3ac5c0fe2 --- M includes/specials/SpecialProtectedpages.php 1 file changed, 34 insertions(+), 82 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/26/400626/1 diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php index 987bcdd..2ef9eaf 100644 --- a/includes/specials/SpecialProtectedpages.php +++ b/includes/specials/SpecialProtectedpages.php @@ -96,15 +96,42 @@ $size, $indefOnly, $cascadeOnly, $noRedirect ) { $formDescriptor = [ - 'namespace' => $this->getNamespaceMenu( $namespace ), + 'namespace' => [ + 'class' => 'HTMLSelectNamespace', + 'name' => 'namespace', + 'id' => 'namespace', + 'cssclass' => 'namespaceselector', + 'selected' => $namespace, + 'all' => '', + 'label' => $this->msg( 'namespace' )->text(), + ], 'typemenu' => $this->getTypeMenu( $type ), 'levelmenu' => $this->getLevelMenu( $level ), - - 'expirycheck' => $this->getExpiryCheck( $indefOnly ), - 'cascadecheck' => $this->getCascadeCheck( $cascadeOnly ), - 'redirectcheck' => $this->getRedirectCheck( $noRedirect ), - - 'sizelimit' => $this->getSizeLimit( $sizetype, $size ), + 'expirycheck' => [ + 'type' => 'check', + 'label' => $this->msg( 'protectedpages-indef' )->text(), + 'name' => 'indefonly', + 'id' => 'indefonly', + 'value' => $indefOnly + ], + 'cascadecheck' => [ + 'type' => 'check', + 'label' => $this->msg( 'protectedpages-cascade' )->text(), + 'name' => 'cascadeonly', + 'id' => 'cascadeonly', + 'value' => $cascadeOnly + ], + 'redirectcheck' => [ + 'type' => 'check', + 'label' => $this->msg( 'protectedpages-noredirect' )->text(), + 'name' => 'noredirect', + 'id' => 'noredirect', + 'value' => $noRedirect, + ], + 'sizelimit' => [ + 'class' => 'HTMLSizeFilterField', + 'name' => 'size', + ] ]; $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() ); $htmlForm @@ -113,81 +140,6 @@ ->setSubmitText( $this->msg( 'protectedpages-submit' )->text() ); return $htmlForm->prepareForm()->getHTML( false ); - } - - /** -* Prepare the namespace filter drop-down; standard namespace -* selector, sans the MediaWiki namespace -* -* @param string|null $namespace Pre-select namespace -* @return array -*/ - protected function getNamespaceMenu( $namespace = null ) { - return [ - 'class' => 'HTMLSelectNamespace', - 'name' => 'namespace', - 'id' => 'namespace', - 'cssclass' => 'namespaceselector', - 'selected' => $namespace, - 'all' => '', - 'label' => $this->msg( 'namespace' )->text(), - ]; - } - - /** -* @param bool $indefOnly -* @return array -*/ - protected function getExpiryCheck( $indefOnly ) { - return [ - 'type' => 'check', - 'label' => $this->msg( 'protectedpages-indef' )->text(), - 'name' => 'indefonly', - 'id' => 'indefonly', - 'value' => $indefOnly - ]; - } - - /** -* @param bool $cascadeOnly -* @return array -*/ - protected function getCascadeCheck( $cascadeOnly ) { - return [ -
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use findItemFromData instead getItemFromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400470 ) Change subject: Use findItemFromData instead getItemFromData .. Use findItemFromData instead getItemFromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: Ie996b7328c5d023d2f89abd4d07d704c2bf1831d --- M src/ui/elements/ve.ui.DiffElement.js M src/ui/widgets/ve.ui.MediaSizeWidget.js 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/70/400470/1 diff --git a/src/ui/elements/ve.ui.DiffElement.js b/src/ui/elements/ve.ui.DiffElement.js index 329fcb2..9a5938e 100644 --- a/src/ui/elements/ve.ui.DiffElement.js +++ b/src/ui/elements/ve.ui.DiffElement.js @@ -158,7 +158,7 @@ var elementId = $( e.target ).closest( '[data-diff-id]' ).attr( 'data-diff-id' ); if ( elementId !== undefined ) { this.descriptions.highlightItem( - this.descriptions.getItemFromData( +elementId ) + this.descriptions.findItemFromData( +elementId ) ); } else { this.descriptions.highlightItem(); diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js b/src/ui/widgets/ve.ui.MediaSizeWidget.js index eea24ca..ae2450d 100644 --- a/src/ui/widgets/ve.ui.MediaSizeWidget.js +++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js @@ -159,7 +159,7 @@ ve.ui.MediaSizeWidget.prototype.onScalableOriginalSizeChange = function ( dimensions ) { var disabled = !dimensions || $.isEmptyObject( dimensions ); this.fullSizeButton.setDisabled( disabled ); - this.sizeTypeSelectWidget.getItemFromData( 'default' ).setDisabled( disabled ); + this.sizeTypeSelectWidget.findItemFromData( 'default' ).setDisabled( disabled ); // Revalidate current dimensions this.validateDimensions(); }; @@ -310,7 +310,7 @@ Number( this.dimensionsWidget.getHeight() ) === 0 ) { this.sizeTypeSelectWidget.chooseItem( - this.sizeTypeSelectWidget.getItemFromData( sizeType ) + this.sizeTypeSelectWidget.findItemFromData( sizeType ) ); } }; @@ -350,10 +350,10 @@ // If we don't have original dimensions, disable the full size button if ( !this.scalable.getOriginalDimensions() ) { this.fullSizeButton.setDisabled( true ); - this.sizeTypeSelectWidget.getItemFromData( 'default' ).setDisabled( true ); + this.sizeTypeSelectWidget.findItemFromData( 'default' ).setDisabled( true ); } else { this.fullSizeButton.setDisabled( false ); - this.sizeTypeSelectWidget.getItemFromData( 'default' ).setDisabled( false ); + this.sizeTypeSelectWidget.findItemFromData( 'default' ).setDisabled( false ); // Call for the set size type according to default or custom settings of the scalable this.setSizeType( this.scalable.isDefault() ? 'default' : 'custom' ); @@ -377,7 +377,7 @@ */ ve.ui.MediaSizeWidget.prototype.onFullSizeButtonClick = function () { this.sizeTypeSelectWidget.chooseItem( - this.sizeTypeSelectWidget.getItemFromData( 'custom' ) + this.sizeTypeSelectWidget.findItemFromData( 'custom' ) ); this.setCurrentDimensions( this.scalable.getOriginalDimensions() ); this.dimensionsWidget.setDisabled( false ); @@ -541,7 +541,7 @@ } else { this.dimensionsWidget.removeDefaults(); } - this.sizeTypeSelectWidget.getItemFromData( 'default' ).setDisabled( + this.sizeTypeSelectWidget.findItemFromData( 'default' ).setDisabled( $.isEmptyObject( defaultDimensions ) ); this.validateDimensions(); -- To view, visit https://gerrit.wikimedia.org/r/400470 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie996b7328c5d023d2f89abd4d07d704c2bf1831d Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use findItemFromData instead getItemFromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400469 ) Change subject: Use findItemFromData instead getItemFromData .. Use findItemFromData instead getItemFromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: I379da96a42c440c7d2d5dc2f3de2773c03546c04 --- M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/69/400469/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js index a0520d2..bad496b 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js @@ -113,7 +113,7 @@ isSource = ve.init.target.getSurface().getMode() === 'source'; visualOnlyPages.forEach( function ( page ) { - selectWidget.getItemFromData( page ).setDisabled( isSource ); + selectWidget.findItemFromData( page ).setDisabled( isSource ); } ); if ( isSource && visualOnlyPages.indexOf( data.page || 'categories' ) !== -1 ) { -- To view, visit https://gerrit.wikimedia.org/r/400469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I379da96a42c440c7d2d5dc2f3de2773c03546c04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Use findItemFromData instead getItemFromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400468 ) Change subject: Use findItemFromData instead getItemFromData .. Use findItemFromData instead getItemFromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: If93d7d85e05c57c65728a7b9dbc7f1c93c9953d8 --- M modules/ext.templateDataGenerator.ui.tdDialog.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData refs/changes/68/400468/1 diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js b/modules/ext.templateDataGenerator.ui.tdDialog.js index efa6fe3..48848c9 100644 --- a/modules/ext.templateDataGenerator.ui.tdDialog.js +++ b/modules/ext.templateDataGenerator.ui.tdDialog.js @@ -650,7 +650,7 @@ if ( value !== undefined ) { // Change the actual input if ( prop.type === 'select' ) { - propInput.selectItem( propInput.getItemFromData( value ) ); + propInput.selectItem( propInput.findItemFromData( value ) ); } else if ( prop.type === 'boolean' ) { propInput.setSelected( !!value ); } else { @@ -666,7 +666,7 @@ } else { // Empty the input if ( prop.type === 'select' ) { - propInput.selectItem( propInput.getItemFromData( prop.default ) ); + propInput.selectItem( propInput.findItemFromData( prop.default ) ); } else if ( prop.type === 'boolean' ) { propInput.setSelected( false ); } else { -- To view, visit https://gerrit.wikimedia.org/r/400468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If93d7d85e05c57c65728a7b9dbc7f1c93c9953d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Use findItemFromData instead getItemFromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400467 ) Change subject: Use findItemFromData instead getItemFromData .. Use findItemFromData instead getItemFromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: I70ea6c0c01f47b72d05b4d3bfc5f98aedb5601ee --- M resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/67/400467/1 diff --git a/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js b/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js index 87930df..dfc9fbf 100644 --- a/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js +++ b/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js @@ -858,7 +858,7 @@ BannerSequenceWidget.prototype.updateFromModelForBucket = function ( bucket ) { var sequence = this.model.getBktSequences()[ bucket ], - seqContainer = this.getItemFromData( bucket ); + seqContainer = this.findItemFromData( bucket ); // If we don't have a sequence container for this bucket it, create it if ( !seqContainer ) { @@ -887,7 +887,7 @@ * Tell the sequence container for a bucket to remove a step */ BannerSequenceWidget.prototype.removeStepForBucket = function ( bucket, stepNum ) { - var seqContainerWidget = this.getItemFromData( bucket ); + var seqContainerWidget = this.findItemFromData( bucket ); seqContainerWidget.removeStep( stepNum ); }; @@ -902,7 +902,7 @@ bucket, stepsWithMissingBanners ) { - this.getItemFromData( bucket ).setMissingBannerErrors( stepsWithMissingBanners ); + this.findItemFromData( bucket ).setMissingBannerErrors( stepsWithMissingBanners ); }; /** @@ -912,7 +912,7 @@ bucket, banners ) { - this.getItemFromData( bucket ).updateBannersForDropDowns( banners ); + this.findItemFromData( bucket ).updateBannersForDropDowns( banners ); }; /** @@ -920,7 +920,7 @@ * sequence. */ BannerSequenceWidget.prototype.updateTotalPageViewsForBucket = function ( bucket ) { - this.getItemFromData( bucket ).updateTotalPageViews(); + this.findItemFromData( bucket ).updateTotalPageViews(); }; /* BucketSeqContainerWidget */ @@ -1007,7 +1007,7 @@ // Go through steps in model, adding or updating widgets as needed for ( i = 0; i < this.model.length; i++ ) { stepModel = this.model[ i ]; - stepWidget = this.bucketSeqWidget.getItemFromData( i ); + stepWidget = this.bucketSeqWidget.findItemFromData( i ); if ( !stepWidget ) { this.addStepWidget( stepModel, i ); @@ -1080,7 +1080,7 @@ BucketSeqContainerWidget.prototype.removeStep = function ( stepNum ) { - var stepWidget = this.bucketSeqWidget.getItemFromData( stepNum ); + var stepWidget = this.bucketSeqWidget.findItemFromData( stepNum ); stepWidget.clearFromGeneralErrorState(); this.bucketSeqWidget.removeItems( [ stepWidget ] ); @@ -1101,7 +1101,7 @@ for ( i = 0; i < stepsWithMissingBanners.length; i++ ) { this.bucketSeqWidget - .getItemFromData( stepsWithMissingBanners[ i ] ) + .findItemFromData( stepsWithMissingBanners[ i ] ) .setMissingBannerError( true ); } }; -- To view, visit https://gerrit.wikimedia.org/r/400467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70ea6c0c01f47b72d05b4d3bfc5f98aedb5601ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use findItemFromData instead getItemFromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400466 ) Change subject: Use findItemFromData instead getItemFromData .. Use findItemFromData instead getItemFromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: I076b28c0cd11c4fd47ebe1a68cefa8c8ad9000c9 --- M modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js M modules/flow/ui/widgets/mw.flow.ui.CategoriesWidget.js 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/66/400466/1 diff --git a/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js b/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js index 55b9c6c..afcadee 100644 --- a/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js +++ b/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js @@ -133,7 +133,7 @@ mw.flow.ve.ui.MentionTargetInputWidget.prototype.initializeLookupMenuSelection = function () { var item; if ( this.username ) { - this.lookupMenu.selectItem( this.lookupMenu.getItemFromData( this.username ) ); + this.lookupMenu.selectItem( this.lookupMenu.findItemFromData( this.username ) ); } item = this.lookupMenu.getSelectedItem(); diff --git a/modules/flow/ui/widgets/mw.flow.ui.CategoriesWidget.js b/modules/flow/ui/widgets/mw.flow.ui.CategoriesWidget.js index d53ac8a..dd60f66 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.CategoriesWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.CategoriesWidget.js @@ -87,7 +87,7 @@ widgets = []; for ( i = 0, len = categories.length; i < len; i++ ) { - widgets.push( this.getItemFromData( categories[ i ].getId() ) ); + widgets.push( this.findItemFromData( categories[ i ].getId() ) ); } this.removeItems( widgets ); -- To view, visit https://gerrit.wikimedia.org/r/400466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I076b28c0cd11c4fd47ebe1a68cefa8c8ad9000c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Use findItem(s)FromData instead getItem(s)FromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398224 ) Change subject: Use findItem(s)FromData instead getItem(s)FromData .. Use findItem(s)FromData instead getItem(s)FromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: Iddd1d3f5abaa233adbf030114343a8ed248de28b --- M modules/ui/mw.echo.ui.CrossWikiUnreadFilterWidget.js M modules/ui/mw.echo.ui.NotificationsInboxWidget.js M modules/ui/mw.echo.ui.PaginationWidget.js M modules/ui/mw.echo.ui.SortedListWidget.js 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/24/398224/1 diff --git a/modules/ui/mw.echo.ui.CrossWikiUnreadFilterWidget.js b/modules/ui/mw.echo.ui.CrossWikiUnreadFilterWidget.js index fe6d13f..5b5134c 100644 --- a/modules/ui/mw.echo.ui.CrossWikiUnreadFilterWidget.js +++ b/modules/ui/mw.echo.ui.CrossWikiUnreadFilterWidget.js @@ -159,10 +159,10 @@ this.addItems( widgets ); // Select the current source - selectedWidget = this.getItemFromData( selectedSource ); + selectedWidget = this.findItemFromData( selectedSource ); if ( selectedPage ) { // Select a specific page - item = selectedWidget.getItemFromData( selectedPage ); + item = selectedWidget.findItemFromData( selectedPage ); } else { // The wiki title is selected item = selectedWidget.getTitleItem(); diff --git a/modules/ui/mw.echo.ui.NotificationsInboxWidget.js b/modules/ui/mw.echo.ui.NotificationsInboxWidget.js index 6791ffe..e826361 100644 --- a/modules/ui/mw.echo.ui.NotificationsInboxWidget.js +++ b/modules/ui/mw.echo.ui.NotificationsInboxWidget.js @@ -168,7 +168,7 @@ */ mw.echo.ui.NotificationsInboxWidget.prototype.updateReadStateSelectWidget = function () { this.readStateSelectWidget - .getItemFromData( this.manager.getFiltersModel().getReadState() ) + .findItemFromData( this.manager.getFiltersModel().getReadState() ) .setSelected( true ); }; diff --git a/modules/ui/mw.echo.ui.PaginationWidget.js b/modules/ui/mw.echo.ui.PaginationWidget.js index 0a3208e..2a435dc 100644 --- a/modules/ui/mw.echo.ui.PaginationWidget.js +++ b/modules/ui/mw.echo.ui.PaginationWidget.js @@ -109,9 +109,9 @@ * Update the state - disabled and visibility - of the sub widgets. */ mw.echo.ui.PaginationWidget.prototype.updateWidgetState = function () { - this.dirSelectWidget.getItemFromData( 'prev' ) + this.dirSelectWidget.findItemFromData( 'prev' ) .setDisabled( this.isDisabled() || !this.model.hasPrevPage() ); - this.dirSelectWidget.getItemFromData( 'next' ) + this.dirSelectWidget.findItemFromData( 'next' ) .setDisabled( this.isDisabled() || !this.model.hasNextPage() ); this.startButton.toggle( diff --git a/modules/ui/mw.echo.ui.SortedListWidget.js b/modules/ui/mw.echo.ui.SortedListWidget.js index 591c0ad..1ae941e 100644 --- a/modules/ui/mw.echo.ui.SortedListWidget.js +++ b/modules/ui/mw.echo.ui.SortedListWidget.js @@ -136,7 +136,7 @@ * @param {string} data Item data to search for * @return {OO.ui.Element|null} Item with equivalent data, `null` if none exists */ - mw.echo.ui.SortedListWidget.prototype.getItemFromData = function ( data ) { + mw.echo.ui.SortedListWidget.prototype.findItemFromData = function ( data ) { var i, len, item, hash = OO.getHash( data ); -- To view, visit https://gerrit.wikimedia.org/r/398224 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddd1d3f5abaa233adbf030114343a8ed248de28b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Use findItem(s)FromData instead getItem(s)FromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398223 ) Change subject: Use findItem(s)FromData instead getItem(s)FromData .. Use findItem(s)FromData instead getItem(s)FromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: Idea863e934f74bdf9a87868cbf9411f853ca11e8 --- M modules/ui/ext.advancedSearch.FileTypeSelection.js M modules/ui/ext.advancedSearch.NamespaceFilters.js M modules/ui/ext.advancedSearch.NamespacePresets.js M tests/qunit/ui/NamespaceFilters.test.js 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch refs/changes/23/398223/1 diff --git a/modules/ui/ext.advancedSearch.FileTypeSelection.js b/modules/ui/ext.advancedSearch.FileTypeSelection.js index e3d2b10..dbb8152 100644 --- a/modules/ui/ext.advancedSearch.FileTypeSelection.js +++ b/modules/ui/ext.advancedSearch.FileTypeSelection.js @@ -41,7 +41,7 @@ mw.libs.advancedSearch.ui.FileTypeSelection.prototype.setValueFromStore = function () { var storeValue = this.store.getOption( this.optionId ), - selectedItem = this.dropdownWidget.getMenu().getItemFromData( storeValue ); + selectedItem = this.dropdownWidget.getMenu().findItemFromData( storeValue ); // avoid setting invalid values and re-triggering if ( selectedItem === null || this.getValue() === storeValue ) { return; diff --git a/modules/ui/ext.advancedSearch.NamespaceFilters.js b/modules/ui/ext.advancedSearch.NamespaceFilters.js index 71db8ff..d3772f7 100644 --- a/modules/ui/ext.advancedSearch.NamespaceFilters.js +++ b/modules/ui/ext.advancedSearch.NamespaceFilters.js @@ -172,7 +172,7 @@ var self = this; $.each( this.getMenu().getItems(), function ( index, menuItem ) { - menuItem.setDisabled( !!self.getItemFromData( menuItem.getData() ) ); + menuItem.setDisabled( !!self.findItemFromData( menuItem.getData() ) ); } ); }; diff --git a/modules/ui/ext.advancedSearch.NamespacePresets.js b/modules/ui/ext.advancedSearch.NamespacePresets.js index b83cfb3..edd2150 100644 --- a/modules/ui/ext.advancedSearch.NamespacePresets.js +++ b/modules/ui/ext.advancedSearch.NamespacePresets.js @@ -76,7 +76,7 @@ } ); this.checkboxMultiselectWidget.off( 'change', this.updateStoreFromPresets, this ); $.each( selectedPresets, function ( key, isSelected ) { - var presetWidget = self.checkboxMultiselectWidget.getItemFromData( key ); + var presetWidget = self.checkboxMultiselectWidget.findItemFromData( key ); if ( presetWidget.isSelected() !== isSelected ) { presetWidget.setSelected( isSelected ); } diff --git a/tests/qunit/ui/NamespaceFilters.test.js b/tests/qunit/ui/NamespaceFilters.test.js index 76fd25a..e296636 100644 --- a/tests/qunit/ui/NamespaceFilters.test.js +++ b/tests/qunit/ui/NamespaceFilters.test.js @@ -40,8 +40,8 @@ menu = filter.getMenu(); assert.equal( menu.getItemCount(), 5 ); - var firstItem = menu.getItemFromData( 'test' ), - lastItem = menu.getItemFromData( '3' ); + var firstItem = menu.findItemFromData( 'test' ), + lastItem = menu.findItemFromData( '3' ); assert.ok( firstItem ); assert.ok( lastItem ); assert.equal( menu.getItemIndex( firstItem ), 0 ); @@ -61,8 +61,8 @@ } ), menu = filter.getMenu(); assert.equal( menu.getItemCount(), 2 ); - assert.notOk( menu.getItemFromData( '0' ) ); - assert.notOk( menu.getItemFromData( '1' ) ); + assert.notOk( menu.findItemFromData( '0' ) ); + assert.notOk( menu.findItemFromData( '1' ) ); } ); QUnit.assert.namespaceElementsPresent = function ( element, expectedNamespaces, message ) { -- To view, visit https://gerrit.wikimedia.org/r/398223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idea863e934f74bdf9a87868cbf9411f853ca11e8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AdvancedSearch Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use findItemFromData instead getItemFromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398221 ) Change subject: Use findItemFromData instead getItemFromData .. Use findItemFromData instead getItemFromData Change-Id: I3cea1dacc1452b05e7e7423e47dcb2ffdf70c1ce Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 --- M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js M resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/21/398221/1 diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js index 91a2d5f..6db55d4 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -474,7 +474,7 @@ this.controller.toggleFilterSelect( item.model.getName() ); // Select the tag if it exists, or reset selection otherwise - this.selectTag( this.getItemFromData( item.model.getName() ) ); + this.selectTag( this.findItemFromData( item.model.getName() ) ); this.focus(); }; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js index ad3b304..64a7fcf 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js @@ -84,8 +84,8 @@ * @param {string} color Selected color */ mw.rcfilters.ui.HighlightColorPickerWidget.prototype.selectColor = function ( color ) { - var previousItem = this.buttonSelect.getItemFromData( this.currentSelection ), - selectedItem = this.buttonSelect.getItemFromData( color ); + var previousItem = this.buttonSelect.findItemFromData( this.currentSelection ), + selectedItem = this.buttonSelect.findItemFromData( color ); if ( this.currentSelection !== color ) { this.currentSelection = color; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js index 71e3b55..060ead0 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js @@ -309,7 +309,7 @@ if ( this.default !== isDefault ) { this.default = isDefault; this.setIcon( this.default ? 'pushPin' : '' ); - this.menu.getItemFromData( 'default' ).setLabel( + this.menu.findItemFromData( 'default' ).setLabel( this.default ? mw.msg( 'rcfilters-savedqueries-unsetdefault' ) : mw.msg( 'rcfilters-savedqueries-setdefault' ) diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js index 8287ef9..7077434 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js @@ -131,7 +131,7 @@ * @param {mw.rcfilters.ui.SavedLinksListItemWidget} item Menu item */ mw.rcfilters.ui.SavedLinksListWidget.prototype.onModelAddItem = function ( item ) { - if ( this.menu.getItemFromData( item.getID() ) ) { + if ( this.menu.findItemFromData( item.getID() ) ) { return; } @@ -147,7 +147,7 @@ * @param {mw.rcfilters.ui.SavedLinksListItemWidget} item Menu item */ mw.rcfilters.ui.SavedLinksListWidget.prototype.onModelRemoveItem = function ( item ) { - this.menu.removeItems( [ this.menu.getItemFromData( item.getID() ) ] ); + this.menu.removeItems( [ this.menu.findItemFromData( item.getID() ) ] ); this.placeholderItem.toggle( this.model.isEmpty() ); }; }( mediaWiki ) ); diff --git
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use findItem(s)FromData instead getItem(s)FromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398217 ) Change subject: Use findItem(s)FromData instead getItem(s)FromData .. Use findItem(s)FromData instead getItem(s)FromData Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Bug: T76630 Change-Id: I1fe6d194a87579dc457708d88dd01b30c5b8a1c3 --- M modules/tools/ext.cx.tools.template.editor.js M modules/tools/mw.cx.tools.MachineTranslationTool.js M modules/ui/mw.cx.ui.ToolsColumn.js 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/17/398217/1 diff --git a/modules/tools/ext.cx.tools.template.editor.js b/modules/tools/ext.cx.tools.template.editor.js index e2f5c05..ab0ca62 100644 --- a/modules/tools/ext.cx.tools.template.editor.js +++ b/modules/tools/ext.cx.tools.template.editor.js @@ -433,7 +433,7 @@ selectedOption = selector.getMenu().getSelectedItem(); selectedKeys.forEach( function ( key ) { if ( !selectedOption || key !== selectedOption.getData() ) { - selector.getMenu().getItemFromData( key ).setDisabled( true ); + selector.getMenu().findItemFromData( key ).setDisabled( true ); } } ); } ); diff --git a/modules/tools/mw.cx.tools.MachineTranslationTool.js b/modules/tools/mw.cx.tools.MachineTranslationTool.js index 5ef2cf8..68c26b3 100644 --- a/modules/tools/mw.cx.tools.MachineTranslationTool.js +++ b/modules/tools/mw.cx.tools.MachineTranslationTool.js @@ -153,7 +153,7 @@ } // Validate and fix the given provider if required - item = menu.getItemFromData( provider ); + item = menu.findItemFromData( provider ); if ( provider === undefined || !item ) { // Fallback to something that always exists provider = 'source'; diff --git a/modules/ui/mw.cx.ui.ToolsColumn.js b/modules/ui/mw.cx.ui.ToolsColumn.js index 9511043..6eddfd9 100644 --- a/modules/ui/mw.cx.ui.ToolsColumn.js +++ b/modules/ui/mw.cx.ui.ToolsColumn.js @@ -95,7 +95,7 @@ * @param {mw.cx.tools.TranslationTool} tool The translation tool instance */ mw.cx.ui.ToolsColumn.prototype.showTool = function ( tool ) { - if ( !this.toolContainer.getItemsFromData( tool.getData() ).length ) { + if ( !this.toolContainer.findItemsFromData( tool.getData() ).length ) { this.toolContainer.addItems( [ tool.getCard() ] ); } }; @@ -105,7 +105,7 @@ * @param {mw.cx.tools.TranslationTool} tool The translation tool instance */ mw.cx.ui.ToolsColumn.prototype.hideTool = function ( tool ) { - var items = this.toolContainer.getItemsFromData( tool.getData() ); + var items = this.toolContainer.findItemsFromData( tool.getData() ); this.toolContainer.removeItems( items ); }; -- To view, visit https://gerrit.wikimedia.org/r/398217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fe6d194a87579dc457708d88dd01b30c5b8a1c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use findItem(s)FromData instead of getItem(s)FromData
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398209 ) Change subject: Use findItem(s)FromData instead of getItem(s)FromData .. Use findItem(s)FromData instead of getItem(s)FromData Bug: T76630 Change-Id: I1ae2c3da6d1bf1b5c45f8937797661b3c10cd03a --- M demos/classes/IndexedDialog.js M src/layouts/BookletLayout.js M src/layouts/IndexLayout.js M src/widgets/CapsuleMultiselectWidget.js M src/widgets/CheckboxMultiselectInputWidget.js M src/widgets/ComboBoxInputWidget.js M src/widgets/DropdownInputWidget.js M src/widgets/MenuTagMultiselectWidget.js M src/widgets/MultiselectWidget.js M src/widgets/RadioSelectInputWidget.js M src/widgets/SelectWidget.js M src/widgets/TagMultiselectWidget.js 12 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/398209/1 diff --git a/demos/classes/IndexedDialog.js b/demos/classes/IndexedDialog.js index c2d437f..ac93224 100644 --- a/demos/classes/IndexedDialog.js +++ b/demos/classes/IndexedDialog.js @@ -33,7 +33,7 @@ this.indexLayout.addTabPanels( this.tabPanels ); this.$body.append( this.indexLayout.$element ); - this.indexLayout.getTabs().getItemFromData( 'fourth' ).setDisabled( true ); + this.indexLayout.getTabs().findItemFromData( 'fourth' ).setDisabled( true ); }; Demo.IndexedDialog.prototype.getActionProcess = function ( action ) { if ( action ) { diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js index 4fb4d5b..c53017a 100644 --- a/src/layouts/BookletLayout.js +++ b/src/layouts/BookletLayout.js @@ -323,16 +323,16 @@ prev = pages[ index - 1 ]; // Prefer adjacent pages at the same level if ( this.outlined ) { - level = this.outlineSelectWidget.getItemFromData( page.getName() ).getLevel(); + level = this.outlineSelectWidget.findItemFromData( page.getName() ).getLevel(); if ( prev && - level === this.outlineSelectWidget.getItemFromData( prev.getName() ).getLevel() + level === this.outlineSelectWidget.findItemFromData( prev.getName() ).getLevel() ) { return prev; } if ( next && - level === this.outlineSelectWidget.getItemFromData( next.getName() ).getLevel() + level === this.outlineSelectWidget.findItemFromData( next.getName() ).getLevel() ) { return next; } @@ -467,7 +467,7 @@ name = page.getName(); delete this.pages[ name ]; if ( this.outlined ) { - items.push( this.outlineSelectWidget.getItemFromData( name ) ); + items.push( this.outlineSelectWidget.findItemFromData( name ) ); page.setOutlineItem( null ); } } diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js index 22bcc1a..12fb1b5 100644 --- a/src/layouts/IndexLayout.js +++ b/src/layouts/IndexLayout.js @@ -213,16 +213,16 @@ next = tabPanels[ index + 1 ]; prev = tabPanels[ index - 1 ]; // Prefer adjacent tab panels at the same level - level = this.tabSelectWidget.getItemFromData( tabPanel.getName() ).getLevel(); + level = this.tabSelectWidget.findItemFromData( tabPanel.getName() ).getLevel(); if ( prev && - level === this.tabSelectWidget.getItemFromData( prev.getName() ).getLevel() + level === this.tabSelectWidget.findItemFromData( prev.getName() ).getLevel() ) { return prev; } if ( next && - level === this.tabSelectWidget.getItemFromData( next.getName() ).getLevel() + level === this.tabSelectWidget.findItemFromData( next.getName() ).getLevel() ) { return next; } @@ -340,7 +340,7 @@ tabPanel = tabPanels[ i ]; name = tabPanel.getName(); delete this.tabPanels[ name ]; - items.push( this.tabSelectWidget.getItemFromData( name ) ); + items.push( this.tabSelectWidget.findItemFromData( name ) ); tabPanel.setTabItem( null ); } if ( items.length ) { diff --git a/src/widgets/CapsuleMultiselectWidget.js b/src/widgets/CapsuleMultiselectWidget.js index 5509050..e515a8b 100644 ---
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] MultiSelectWidget: Rename getters
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398006 ) Change subject: [DEPRECATING CHANGE] MultiSelectWidget: Rename getters .. [DEPRECATING CHANGE] MultiSelectWidget: Rename getters getSelectedItems to findSelectedItems getSelectedItemsData to findSelectedItemsData Bug: T76630 Change-Id: Ic1be36b62f6c48c9f40feace009fe4ca3e7a8e3f --- M src/widgets/MultiselectWidget.js 1 file changed, 27 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/06/398006/1 diff --git a/src/widgets/MultiselectWidget.js b/src/widgets/MultiselectWidget.js index 98c1645..588a6db 100644 --- a/src/widgets/MultiselectWidget.js +++ b/src/widgets/MultiselectWidget.js @@ -61,28 +61,50 @@ /* Methods */ /** - * Get options that are selected. + * Find options that are selected. * * @return {OO.ui.MultioptionWidget[]} Selected options */ -OO.ui.MultiselectWidget.prototype.getSelectedItems = function () { +OO.ui.MultiselectWidget.prototype.findSelectedItems = function () { return this.items.filter( function ( item ) { return item.isSelected(); } ); }; /** - * Get the data of options that are selected. + * Get options that are selected. + * + * @deprecated 0.25.1 Use {@link findSelectedItems} instead. + * @return {OO.ui.MultioptionWidget[]} Selected options + */ +OO.ui.MultiselectWidget.prototype.getSelectedItems = function () { + OO.ui.warnDeprecation( 'MultiselectWidget#getSelectedItems: Deprecated function. Use findSelectedItems instead. See T76630.' ); + return this.findSelectedItems(); +}; + +/** + * Find the data of options that are selected. * * @return {Object[]|string[]} Values of selected options */ -OO.ui.MultiselectWidget.prototype.getSelectedItemsData = function () { - return this.getSelectedItems().map( function ( item ) { +OO.ui.MultiselectWidget.prototype.findSelectedItemsData = function () { + return this.findSelectedItems().map( function ( item ) { return item.data; } ); }; /** + * Get the data of options that are selected. + * + * @deprecated 0.25.1 Use {@link findSelectedItemsData} instead. + * @return {Object[]|string[]} Values of selected options + */ +OO.ui.MultiselectWidget.prototype.getSelectedItemsData = function () { + OO.ui.warnDeprecation( 'MultiselectWidget#getSelectedItemsData: Deprecated function. Use findSelectedItemsData instead. See T76630.' ); + return this.findSelectedItemsData(); +}; + +/** * Select options by reference. Options not mentioned in the `items` array will be deselected. * * @param {OO.ui.MultioptionWidget[]} items Items to select -- To view, visit https://gerrit.wikimedia.org/r/398006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1be36b62f6c48c9f40feace009fe4ca3e7a8e3f Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] SelectWidget: Rename getSelectedItem to...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398005 ) Change subject: [DEPRECATING CHANGE] SelectWidget: Rename getSelectedItem to findSelectedItem .. [DEPRECATING CHANGE] SelectWidget: Rename getSelectedItem to findSelectedItem Bug: T76630 Change-Id: I0f1d9c1f31efcc10d3647103548770d2101050d9 --- M src/widgets/SelectWidget.js 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/398005/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index 40b35d8..e61bf6d 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -523,11 +523,11 @@ }; /** - * Get selected item. + * Find selected item. * * @return {OO.ui.OptionWidget|null} Selected item, `null` if no item is selected */ -OO.ui.SelectWidget.prototype.getSelectedItem = function () { +OO.ui.SelectWidget.prototype.findSelectedItem = function () { var i, len; for ( i = 0, len = this.items.length; i < len; i++ ) { @@ -539,6 +539,17 @@ }; /** + * Get selected item. + * + * @deprecated 0.25.1 Use {@link #findSelectedItem} instead. + * @return {OO.ui.OptionWidget|null} Selected item, `null` if no item is selected + */ +OO.ui.SelectWidget.prototype.getSelectedItem = function () { + OO.ui.warnDeprecation( 'SelectWidget#getSelectedItem: Deprecated function. Use findSelectedItem instead. See T76630.' ); + return this.findSelectedItem(); +}; + +/** * Find highlighted item. * * @return {OO.ui.OptionWidget|null} Highlighted item, `null` if no item is highlighted -- To view, visit https://gerrit.wikimedia.org/r/398005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f1d9c1f31efcc10d3647103548770d2101050d9 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] GroupElement: Rename getItemFromData to...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398004 ) Change subject: [DEPRECATING CHANGE] GroupElement: Rename getItemFromData to findItemFromData .. [DEPRECATING CHANGE] GroupElement: Rename getItemFromData to findItemFromData Bug: T76630 Change-Id: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f --- M src/mixins/GroupElement.js 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/04/398004/1 diff --git a/src/mixins/GroupElement.js b/src/mixins/GroupElement.js index e84475c..25e1339 100644 --- a/src/mixins/GroupElement.js +++ b/src/mixins/GroupElement.js @@ -62,7 +62,7 @@ }; /** - * Get an item by its data. + * Find an item by its data. * * Only the first item with matching data will be returned. To return all matching items, * use the #getItemsFromData method. @@ -70,7 +70,7 @@ * @param {Object} data Item data to search for * @return {OO.ui.Element|null} Item with equivalent data, `null` if none exists */ -OO.ui.mixin.GroupElement.prototype.getItemFromData = function ( data ) { +OO.ui.mixin.GroupElement.prototype.findItemFromData = function ( data ) { var i, len, item, hash = OO.getHash( data ); @@ -85,6 +85,18 @@ }; /** + * Get an item by its data. + * + * @deprecated 0.25.1 Use {@link #findItemFromData} instead. + * @param {Object} data Item data to search for + * @return {OO.ui.Element|null} Item with equivalent data, `null` if none exists + */ +OO.ui.mixin.GroupElement.prototype.getItemFromData = function ( data ) { + OO.ui.warnDeprecation( 'GroupElement#getItemFromData. Deprecated function. Use findItemFromData instead. See T76630' ); + return this.findItemFromData( data ); +}; + +/** * Get items by their data. * * All items with matching data will be returned. To return only the first match, use the #getItemFromData method instead. -- To view, visit https://gerrit.wikimedia.org/r/398004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: icons: Add lightbulb icon
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397998 ) Change subject: icons: Add lightbulb icon .. icons: Add lightbulb icon Bug: T175006 Change-Id: I90fe58e79559b7e47a62af6b216098b49802b274 --- M demos/pages/icons.js M src/themes/apex/icons-alerts.json A src/themes/apex/images/icons/lightbulb.svg M src/themes/wikimediaui/icons-alerts.json A src/themes/wikimediaui/images/icons/lightbulb.svg 5 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/98/397998/1 diff --git a/demos/pages/icons.js b/demos/pages/icons.js index 0f85058..8d9d8a4 100644 --- a/demos/pages/icons.js +++ b/demos/pages/icons.js @@ -38,6 +38,7 @@ 'alert', 'bell', 'comment', + 'lightbulb', 'message', 'notice', 'speechBubble', diff --git a/src/themes/apex/icons-alerts.json b/src/themes/apex/icons-alerts.json index 9bef0a1..ca2a8c3 100644 --- a/src/themes/apex/icons-alerts.json +++ b/src/themes/apex/icons-alerts.json @@ -11,6 +11,7 @@ "deprecated": "This will be removed in v0.26.0." }, "comment": { "file": "images/icons/comment.svg" }, + "lightbulb": { "file": "images/icons/lightbulb.svg" }, "message": { "file": { "ltr": "images/icons/message-ltr.svg", "rtl": "images/icons/message-rtl.svg" diff --git a/src/themes/apex/images/icons/lightbulb.svg b/src/themes/apex/images/icons/lightbulb.svg new file mode 100644 index 000..a4aa8f3 --- /dev/null +++ b/src/themes/apex/images/icons/lightbulb.svg @@ -0,0 +1,5 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + + diff --git a/src/themes/wikimediaui/icons-alerts.json b/src/themes/wikimediaui/icons-alerts.json index 996609b..a51caf9 100644 --- a/src/themes/wikimediaui/icons-alerts.json +++ b/src/themes/wikimediaui/icons-alerts.json @@ -28,6 +28,7 @@ "deprecated": "This will be removed in v0.26.0." }, "comment": { "file": "images/icons/comment.svg" }, + "lightbulb": { "file": "images/icons/lightbulb.svg" }, "message": { "file": { "ltr": "images/icons/message-ltr.svg", "rtl": "images/icons/message-rtl.svg" diff --git a/src/themes/wikimediaui/images/icons/lightbulb.svg b/src/themes/wikimediaui/images/icons/lightbulb.svg new file mode 100644 index 000..a4aa8f3 --- /dev/null +++ b/src/themes/wikimediaui/images/icons/lightbulb.svg @@ -0,0 +1,5 @@ + +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> + + + -- To view, visit https://gerrit.wikimedia.org/r/397998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90fe58e79559b7e47a62af6b216098b49802b274 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Unify BetaFeatures SVG screenshot markup
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394523 ) Change subject: Unify BetaFeatures SVG screenshot markup .. Unify BetaFeatures SVG screenshot markup - sort attributes - indentation Bug: T180427 Change-Id: Id537f55ab4380aca5c7c1b34f0b3aeaf6dfe5ad3 --- M resources/TwoColConflict-beta-features-ltr.svg M resources/TwoColConflict-beta-features-rtl.svg 2 files changed, 86 insertions(+), 86 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict refs/changes/23/394523/1 diff --git a/resources/TwoColConflict-beta-features-ltr.svg b/resources/TwoColConflict-beta-features-ltr.svg index ba586c2..621bbc0 100644 --- a/resources/TwoColConflict-beta-features-ltr.svg +++ b/resources/TwoColConflict-beta-features-ltr.svg @@ -1,44 +1,44 @@ - -http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 264 162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/TwoColConflict-beta-features-rtl.svg b/resources/TwoColConflict-beta-features-rtl.svg index 12be2f4..20c62de 100644 --- a/resources/TwoColConflict-beta-features-rtl.svg +++ b/resources/TwoColConflict-beta-features-rtl.svg @@ -1,44 +1,44 @@ - -http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 264 162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.wikimedia.org/r/394523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id537f55ab4380aca5c7c1b34f0b3aeaf6dfe5ad3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Unify BetaFeatures SVG screenshot markup
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394521 ) Change subject: Unify BetaFeatures SVG screenshot markup .. Unify BetaFeatures SVG screenshot markup - sort attributes - generalizing attributes on `g` where applicable - indentation Bug: T180427 Change-Id: I4374686c216f39a0bf9d7e520545666c8227f1b9 --- M images/ORES-beta-features-ltr.svg M images/ORES-beta-features-rtl.svg 2 files changed, 70 insertions(+), 74 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES refs/changes/21/394521/1 diff --git a/images/ORES-beta-features-ltr.svg b/images/ORES-beta-features-ltr.svg index 0f666a8..be4f836 100644 --- a/images/ORES-beta-features-ltr.svg +++ b/images/ORES-beta-features-ltr.svg @@ -1,38 +1,36 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 0 264 162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/ORES-beta-features-rtl.svg b/images/ORES-beta-features-rtl.svg index b621556..668c238 100644 --- a/images/ORES-beta-features-rtl.svg +++ b/images/ORES-beta-features-rtl.svg @@ -1,38 +1,36 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 0 264 162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.wikimedia.org/r/394521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4374686c216f39a0bf9d7e520545666c8227f1b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ORES Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Unify BetaFeatures SVG screenshot markup
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393996 ) Change subject: Unify BetaFeatures SVG screenshot markup .. Unify BetaFeatures SVG screenshot markup - sort attributes - indentation - remove unnecessary ids Bug: T180427 Change-Id: I04d37d4c58aa3499af241dc434985a98a13f51ea --- M resources/images/codemirror-beta-ltr.svg M resources/images/codemirror-beta-rtl.svg 2 files changed, 114 insertions(+), 114 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/96/393996/1 diff --git a/resources/images/codemirror-beta-ltr.svg b/resources/images/codemirror-beta-ltr.svg index c2e18e1..c6fc999 100644 --- a/resources/images/codemirror-beta-ltr.svg +++ b/resources/images/codemirror-beta-ltr.svg @@ -1,58 +1,58 @@ - -http://www.w3.org/2000/svg; id="svg85" height="162" width="264" viewBox="0 0 264 162"> - - - - - - - .st0{fill:#36c}.st1{fill:#eaecf0}.st2{fill:#fff}.st3,.st4,.st5{opacity:6e-2;enable-background:new}.st4,.st5{opacity:7e-2}.st5{opacity:.25;fill:none;stroke:#fff;stroke-width:.5;stroke-miterlimit:10}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#fc3} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; height="162" width="264"> + + + + + + + .st0{fill:#36c}.st2{fill:#fff}.st3{opacity:6e-2;enable-background:new}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#fc3} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/codemirror-beta-rtl.svg b/resources/images/codemirror-beta-rtl.svg index 4e3527b..91a3064 100644 --- a/resources/images/codemirror-beta-rtl.svg +++ b/resources/images/codemirror-beta-rtl.svg @@ -1,58 +1,58 @@ - -http://www.w3.org/2000/svg; id="svg85" height="162" width="264" viewBox="0 0 264 162"> - - - - - - - .st0{fill:#36c}.st1{fill:#eaecf0}.st2{fill:#fff}.st3,.st4,.st5{opacity:6e-2;enable-background:new}.st4,.st5{opacity:7e-2}.st5{opacity:.25;fill:none;stroke:#fff;stroke-width:.5;stroke-miterlimit:10}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#fc3} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; height="162" width="264"> + + + + + + + .st0{fill:#36c}.st2{fill:#fff}.st3{opacity:6e-2;enable-background:new}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#fc3} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Unify BetaFeatures SVG screenshot markup
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393992 ) Change subject: Unify BetaFeatures SVG screenshot markup .. Unify BetaFeatures SVG screenshot markup - sort attributes - generalizing attributes on `g` where applicable - indentation Bug: T180427 Change-Id: I0bb2f1bd0e5c132aa928540b82c00a48b0b7cd41 --- M resources/TwoColConflict-beta-features-ltr.svg M resources/TwoColConflict-beta-features-rtl.svg 2 files changed, 60 insertions(+), 86 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict refs/changes/92/393992/1 diff --git a/resources/TwoColConflict-beta-features-ltr.svg b/resources/TwoColConflict-beta-features-ltr.svg index ba586c2..f370387 100644 --- a/resources/TwoColConflict-beta-features-ltr.svg +++ b/resources/TwoColConflict-beta-features-ltr.svg @@ -1,44 +1,30 @@ - -http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; width="264" height="162"> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/TwoColConflict-beta-features-rtl.svg b/resources/TwoColConflict-beta-features-rtl.svg index 12be2f4..26c9339 100644 --- a/resources/TwoColConflict-beta-features-rtl.svg +++ b/resources/TwoColConflict-beta-features-rtl.svg @@ -1,44 +1,32 @@ - -http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; width="264" height="162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.wikimedia.org/r/393992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0bb2f1bd0e5c132aa928540b82c00a48b0b7cd41 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Unify BetaFeatures SVG screenshot markup
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393989 ) Change subject: Unify BetaFeatures SVG screenshot markup .. Unify BetaFeatures SVG screenshot markup - sort attributes - generalizing attributes on `g` where applicable - indentation Bug: T180427 Change-Id: Ide60f23914f2e45ffc1ddc051d7531dd12889633 --- M images/ORES-beta-features-ltr.svg M images/ORES-beta-features-rtl.svg 2 files changed, 60 insertions(+), 74 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES refs/changes/89/393989/1 diff --git a/images/ORES-beta-features-ltr.svg b/images/ORES-beta-features-ltr.svg index 0f666a8..28770ef 100644 --- a/images/ORES-beta-features-ltr.svg +++ b/images/ORES-beta-features-ltr.svg @@ -1,38 +1,31 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/ORES-beta-features-rtl.svg b/images/ORES-beta-features-rtl.svg index b621556..90ae431 100644 --- a/images/ORES-beta-features-rtl.svg +++ b/images/ORES-beta-features-rtl.svg @@ -1,38 +1,31 @@ - -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162" viewBox="0 0 264 162" id="svg2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; width="264" height="162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.wikimedia.org/r/393989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide60f23914f2e45ffc1ddc051d7531dd12889633 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ORES Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: betafeatures icons: Correct contrast between light blue and ...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393011 ) Change subject: betafeatures icons: Correct contrast between light blue and gray .. betafeatures icons: Correct contrast between light blue and gray Change-Id: Idace90e945a2bd5efa869ee717224274fd94e91a --- M resources/images/compact-links-ltr.svg M resources/images/compact-links-rtl.svg 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/11/393011/1 diff --git a/resources/images/compact-links-ltr.svg b/resources/images/compact-links-ltr.svg index 0151227..d887637 100644 --- a/resources/images/compact-links-ltr.svg +++ b/resources/images/compact-links-ltr.svg @@ -19,16 +19,16 @@ - - - - + + + + - - + + diff --git a/resources/images/compact-links-rtl.svg b/resources/images/compact-links-rtl.svg index 678b2f1..9d96352 100644 --- a/resources/images/compact-links-rtl.svg +++ b/resources/images/compact-links-rtl.svg @@ -19,16 +19,16 @@ - - - - + + + + - - + + -- To view, visit https://gerrit.wikimedia.org/r/393011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idace90e945a2bd5efa869ee717224274fd94e91a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BetaFeatures[master]: Update Base80 color in betafeatures icons
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393006 ) Change subject: Update Base80 color in betafeatures icons .. Update Base80 color in betafeatures icons Old: https://phabricator.wikimedia.org/F10949492 New: https://phabricator.wikimedia.org/F10949491 Bug: T180427 Change-Id: I60ad8fc3a475219f5b018d876e78f861396505bc --- M resources/images/screenshot-template-ltr.svg M resources/images/screenshot-template-rtl.svg 2 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BetaFeatures refs/changes/06/393006/1 diff --git a/resources/images/screenshot-template-ltr.svg b/resources/images/screenshot-template-ltr.svg index 6716c04..deed7ec 100644 --- a/resources/images/screenshot-template-ltr.svg +++ b/resources/images/screenshot-template-ltr.svg @@ -7,17 +7,17 @@ - - - - + + + + - + - - + + diff --git a/resources/images/screenshot-template-rtl.svg b/resources/images/screenshot-template-rtl.svg index 22398c8..f795af8 100644 --- a/resources/images/screenshot-template-rtl.svg +++ b/resources/images/screenshot-template-rtl.svg @@ -7,17 +7,17 @@ - - - - + + + + - + - - + + -- To view, visit https://gerrit.wikimedia.org/r/393006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60ad8fc3a475219f5b018d876e78f861396505bc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BetaFeatures Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Update betafeatures icons' colors
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393004 ) Change subject: Update betafeatures icons' colors .. Update betafeatures icons' colors Base80, Yellow90, Yellow50, Accent50 Old: https://phabricator.wikimedia.org/F10949243 New: https://phabricator.wikimedia.org/F10949242 Bug: T180427 Change-Id: Iebd9026b37bf63d66a3d0976302e09c4df59e81d --- M resources/images/codemirror-beta-ltr.svg M resources/images/codemirror-beta-rtl.svg 2 files changed, 36 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/04/393004/1 diff --git a/resources/images/codemirror-beta-ltr.svg b/resources/images/codemirror-beta-ltr.svg index bc2f268..c2e18e1 100644 --- a/resources/images/codemirror-beta-ltr.svg +++ b/resources/images/codemirror-beta-ltr.svg @@ -6,30 +6,30 @@ - .st0{fill:#3466cc}.st1{fill:#e5e5e5}.st2{fill:#fff}.st3,.st4,.st5{opacity:6e-2;enable-background:new}.st4,.st5{opacity:7e-2}.st5{opacity:.25;fill:none;stroke:#fff;stroke-width:.5;stroke-miterlimit:10}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#f5a623} + .st0{fill:#36c}.st1{fill:#eaecf0}.st2{fill:#fff}.st3,.st4,.st5{opacity:6e-2;enable-background:new}.st4,.st5{opacity:7e-2}.st5{opacity:.25;fill:none;stroke:#fff;stroke-width:.5;stroke-miterlimit:10}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#fc3} - - - - + + + + - + - - + + - - + + - - + + @@ -38,10 +38,10 @@ - + - + @@ -49,10 +49,10 @@ - - + + - - + + diff --git a/resources/images/codemirror-beta-rtl.svg b/resources/images/codemirror-beta-rtl.svg index 1f998d5..4e3527b 100644 --- a/resources/images/codemirror-beta-rtl.svg +++ b/resources/images/codemirror-beta-rtl.svg @@ -6,30 +6,30 @@ - .st0{fill:#3466cc}.st1{fill:#e5e5e5}.st2{fill:#fff}.st3,.st4,.st5{opacity:6e-2;enable-background:new}.st4,.st5{opacity:7e-2}.st5{opacity:.25;fill:none;stroke:#fff;stroke-width:.5;stroke-miterlimit:10}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#f5a623} + .st0{fill:#36c}.st1{fill:#eaecf0}.st2{fill:#fff}.st3,.st4,.st5{opacity:6e-2;enable-background:new}.st4,.st5{opacity:7e-2}.st5{opacity:.25;fill:none;stroke:#fff;stroke-width:.5;stroke-miterlimit:10}.st6{fill:#00af89}.st7{opacity:.23;enable-background:new}.st7,.st8{fill:#fc3} - - - - + + + + - + - - + + - - + + - - + + @@ -38,10 +38,10 @@ - + - + @@ -49,10 +49,10 @@ - - + + - - + + -- To view, visit https://gerrit.wikimedia.org/r/393004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebd9026b37bf63d66a3d0976302e09c4df59e81d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Update betafeatures icons' colors
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393003 ) Change subject: Update betafeatures icons' colors .. Update betafeatures icons' colors Base80 and Yellow30 Old: https://phabricator.wikimedia.org/F10948752 New: https://phabricator.wikimedia.org/F10948753 Old: https://phabricator.wikimedia.org/F10948759 New: https://phabricator.wikimedia.org/F10948757 Bug: T180427 Change-Id: I406d5dce41e5325a069e556aad67c65df9ae0fcf --- M modules/images/betafeatures-icon-RCFilters-ltr.svg M modules/images/betafeatures-icon-RCFilters-rtl.svg M modules/images/highlight-tour-ltr.svg M modules/images/highlight-tour-rtl.svg 4 files changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages refs/changes/03/393003/1 diff --git a/modules/images/betafeatures-icon-RCFilters-ltr.svg b/modules/images/betafeatures-icon-RCFilters-ltr.svg index d1d0e30..e7c4b5e 100644 --- a/modules/images/betafeatures-icon-RCFilters-ltr.svg +++ b/modules/images/betafeatures-icon-RCFilters-ltr.svg @@ -34,24 +34,24 @@ - - + + - - + + - - + + - - + + diff --git a/modules/images/betafeatures-icon-RCFilters-rtl.svg b/modules/images/betafeatures-icon-RCFilters-rtl.svg index 755f6c7..1b45d50 100644 --- a/modules/images/betafeatures-icon-RCFilters-rtl.svg +++ b/modules/images/betafeatures-icon-RCFilters-rtl.svg @@ -34,24 +34,24 @@ - - + + - - + + - - + + - - + + diff --git a/modules/images/highlight-tour-ltr.svg b/modules/images/highlight-tour-ltr.svg index 5e9a576..786502e 100644 --- a/modules/images/highlight-tour-ltr.svg +++ b/modules/images/highlight-tour-ltr.svg @@ -3,13 +3,13 @@ - - - - - - - + + + + + + + diff --git a/modules/images/highlight-tour-rtl.svg b/modules/images/highlight-tour-rtl.svg index e303991..a61f06f 100644 --- a/modules/images/highlight-tour-rtl.svg +++ b/modules/images/highlight-tour-rtl.svg @@ -7,7 +7,7 @@ - + -- To view, visit https://gerrit.wikimedia.org/r/393003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I406d5dce41e5325a069e556aad67c65df9ae0fcf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Update betafeatures icons' SVG
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393001 ) Change subject: Update betafeatures icons' SVG .. Update betafeatures icons' SVG Gray: Base80, Base70 Old: https://phabricator.wikimedia.org/F10948557 New: https://phabricator.wikimedia.org/F10948556 Bug: T180427 Change-Id: Ie014af9362ccd75ce773af8ee8890f3ac51510e7 --- M resources/TwoColConflict-beta-features-ltr.svg M resources/TwoColConflict-beta-features-rtl.svg 2 files changed, 46 insertions(+), 46 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict refs/changes/01/393001/1 diff --git a/resources/TwoColConflict-beta-features-ltr.svg b/resources/TwoColConflict-beta-features-ltr.svg index 8ec8098..ba586c2 100644 --- a/resources/TwoColConflict-beta-features-ltr.svg +++ b/resources/TwoColConflict-beta-features-ltr.svg @@ -7,38 +7,38 @@ - - - + + + - + - - - - + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/resources/TwoColConflict-beta-features-rtl.svg b/resources/TwoColConflict-beta-features-rtl.svg index 1d89ea5..12be2f4 100644 --- a/resources/TwoColConflict-beta-features-rtl.svg +++ b/resources/TwoColConflict-beta-features-rtl.svg @@ -7,38 +7,38 @@ - - - + + + - + - - - - + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + -- To view, visit https://gerrit.wikimedia.org/r/393001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie014af9362ccd75ce773af8ee8890f3ac51510e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Update colors of betafeatures icon
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392827 ) Change subject: Update colors of betafeatures icon .. Update colors of betafeatures icon Gray: Base80, Base50 Old: https://phabricator.wikimedia.org/F10936805 New: https://phabricator.wikimedia.org/F10936803 Bug: T180427 Change-Id: Ib06437e5e621e251998033bba4b79e21552c54e1 --- M images/ORES-beta-features-ltr.svg M images/ORES-beta-features-rtl.svg 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES refs/changes/27/392827/1 diff --git a/images/ORES-beta-features-ltr.svg b/images/ORES-beta-features-ltr.svg index c4adef1..0f666a8 100644 --- a/images/ORES-beta-features-ltr.svg +++ b/images/ORES-beta-features-ltr.svg @@ -7,21 +7,21 @@ - - - - + + + + - + - - + + - - + + @@ -29,7 +29,7 @@ - + diff --git a/images/ORES-beta-features-rtl.svg b/images/ORES-beta-features-rtl.svg index 692b409..b621556 100644 --- a/images/ORES-beta-features-rtl.svg +++ b/images/ORES-beta-features-rtl.svg @@ -7,21 +7,21 @@ - - - - + + + + - + - - + + - - + + @@ -29,7 +29,7 @@ - + -- To view, visit https://gerrit.wikimedia.org/r/392827 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib06437e5e621e251998033bba4b79e21552c54e1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ORES Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update colors of betafeatures icon
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392824 ) Change subject: Update colors of betafeatures icon .. Update colors of betafeatures icon Grays: Base80, Base70, Base50 Old: https://phabricator.wikimedia.org/F10934877 Old: https://phabricator.wikimedia.org/F10934879 New: https://phabricator.wikimedia.org/F10934876 New: https://phabricator.wikimedia.org/F10934878 Bug: T180427 Change-Id: I1d40411993918e2b060094d7e1e099647d42a6af --- M modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg M modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg M modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg M modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg 4 files changed, 38 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/24/392824/1 diff --git a/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg b/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg index f684b28..984f2dd 100644 --- a/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg +++ b/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg @@ -7,22 +7,22 @@ - - - - - + + + + + - - + + - + - + - + @@ -35,6 +35,6 @@ - + diff --git a/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg b/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg index 1aeca01..e93a573 100644 --- a/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg +++ b/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg @@ -7,10 +7,10 @@ - - - - + + + + @@ -18,18 +18,18 @@ - + - - + + - + - + - + @@ -42,6 +42,6 @@ - + diff --git a/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg b/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg index dc00940..246a28c 100644 --- a/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg +++ b/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg @@ -7,21 +7,21 @@ - - - - - + + + + + - - + + - + diff --git a/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg b/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg index 194ff31..49c42bb 100644 --- a/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg +++ b/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg @@ -7,18 +7,18 @@ - - - - + + + + - + - - + + @@ -28,6 +28,6 @@ - + -- To view, visit https://gerrit.wikimedia.org/r/392824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d40411993918e2b060094d7e1e099647d42a6af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Update colors of betafeatures icons
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392586 ) Change subject: Update colors of betafeatures icons .. Update colors of betafeatures icons * Light gray - Base80 Old: https://phabricator.wikimedia.org/F10913160 New: https://phabricator.wikimedia.org/F10913161 Bug: T180427 Change-Id: I1dc546a0df52ce9b0885d92b29a7c638ef618025 --- M images/betafeature-flow-ltr.svg M images/betafeature-flow-rtl.svg 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/86/392586/1 diff --git a/images/betafeature-flow-ltr.svg b/images/betafeature-flow-ltr.svg index 49870c7..da2d3d6 100644 --- a/images/betafeature-flow-ltr.svg +++ b/images/betafeature-flow-ltr.svg @@ -7,13 +7,13 @@ - - + + - - + + diff --git a/images/betafeature-flow-rtl.svg b/images/betafeature-flow-rtl.svg index 9b3c00f..d4d6e3a 100644 --- a/images/betafeature-flow-rtl.svg +++ b/images/betafeature-flow-rtl.svg @@ -7,14 +7,14 @@ - - - + + + - - + + -- To view, visit https://gerrit.wikimedia.org/r/392586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1dc546a0df52ce9b0885d92b29a7c638ef618025 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Update colors of betafeatures icons
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392581 ) Change subject: Update colors of betafeatures icons .. Update colors of betafeatures icons * Light gray - Base80 Old: https://phabricator.wikimedia.org/F10912613 New: https://phabricator.wikimedia.org/F10912612 Bug: T180427 Change-Id: I91e0495e922a1fcf094af14e424a410fad313ba0 --- M images/popups-ltr.svg M images/popups-rtl.svg 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/81/392581/1 diff --git a/images/popups-ltr.svg b/images/popups-ltr.svg index 1324c81..35ab989 100644 --- a/images/popups-ltr.svg +++ b/images/popups-ltr.svg @@ -7,13 +7,13 @@ - - + + - - + + diff --git a/images/popups-rtl.svg b/images/popups-rtl.svg index 64082e7..5f21e0a 100644 --- a/images/popups-rtl.svg +++ b/images/popups-rtl.svg @@ -7,13 +7,13 @@ - - + + - - + + -- To view, visit https://gerrit.wikimedia.org/r/392581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91e0495e922a1fcf094af14e424a410fad313ba0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update colors betafeatures icon
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392578 ) Change subject: Update colors betafeatures icon .. Update colors betafeatures icon Updated light gray (Base80) and light blue (Accent90). Old: https://phabricator.wikimedia.org/F10912040 New: https://phabricator.wikimedia.org/F10912039 Change-Id: I88d74a0b7447a9a3effb0bb56f3666991558f1fd --- M resources/images/compact-links-ltr.svg M resources/images/compact-links-rtl.svg 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/78/392578/1 diff --git a/resources/images/compact-links-ltr.svg b/resources/images/compact-links-ltr.svg index 3c53ba3..0151227 100644 --- a/resources/images/compact-links-ltr.svg +++ b/resources/images/compact-links-ltr.svg @@ -7,19 +7,19 @@ - + - + - - - + + + diff --git a/resources/images/compact-links-rtl.svg b/resources/images/compact-links-rtl.svg index d9c33e6..678b2f1 100644 --- a/resources/images/compact-links-rtl.svg +++ b/resources/images/compact-links-rtl.svg @@ -7,19 +7,19 @@ - + - + - - - + + + -- To view, visit https://gerrit.wikimedia.org/r/392578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88d74a0b7447a9a3effb0bb56f3666991558f1fd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia-ui-base[master]: Remove repititive comment about breakpoint values
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390363 ) Change subject: Remove repititive comment about breakpoint values .. Remove repititive comment about breakpoint values Change-Id: Id92c426ebd3bb0f4c1a81c7f4be87a51e2ccffee --- M wikimedia-ui-base.css M wikimedia-ui-base.less 2 files changed, 9 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia-ui-base refs/changes/63/390363/1 diff --git a/wikimedia-ui-base.css b/wikimedia-ui-base.css index 10ca2ce..3209a8b 100644 --- a/wikimedia-ui-base.css +++ b/wikimedia-ui-base.css @@ -5,36 +5,28 @@ :root { /* == Breakpoints == */ + /* The following numbers are prone to change with new information. */ + /** * Minimum available screen width at which a device can be considered a mobile device * Many older feature phones have screens smaller than this value. -* Number is prone to change with new information. */ --width-breakpoint-mobile: 320px; /** * Minimum available screen width at which a device can be considered a tablet * The number is currently based on the device width of a Samsung Galaxy S5 mini and is low -* enough to cover iPad (768px). Number is prone to change with new information. +* enough to cover iPad (768px). */ --width-breakpoint-tablet: 720px; - /** -* Minimum available screen width at which a device can be considered a desktop -* Number is prone to change with new information. -*/ + /* Minimum available screen width at which a device can be considered a desktop */ --width-breakpoint-desktop: 1000px; - /** -* Wider desktop breakpoint, currently used in Flow. -* Number is prone to change with new information. -*/ + /* Wider desktop breakpoint, currently used in Flow. */ --width-breakpoint-desktop-wide: 1200px; - /** -* Extra wide desktop breakpoint -* Number is prone to change with new information. -*/ + /* Extra wide desktop breakpoint */ --width-breapoint-desktop-extrawide: 2000px; diff --git a/wikimedia-ui-base.less b/wikimedia-ui-base.less index 7976e62..572013b 100644 --- a/wikimedia-ui-base.less +++ b/wikimedia-ui-base.less @@ -4,35 +4,24 @@ */ // == Breakpoints == +// The following numbers are prone to change with new information. + // Minimum available screen width at which a device can be considered a mobile device // Many older feature phones have screens smaller than this value. -// Number is prone to change with new information. - @width-breakpoint-mobile: 320px; - // Minimum available screen width at which a device can be considered a tablet // The number is currently based on the device width of a Samsung Galaxy S5 mini and is low -// enough to cover iPad (768px). Number is prone to change with new information. - +// enough to cover iPad (768px). @width-breakpoint-tablet: 720px; - // Minimum available screen width at which a device can be considered a desktop -// Number is prone to change with new information. - @width-breakpoint-desktop: 1000px; - // Wider desktop breakpoint, currently used in Flow. -// Number is prone to change with new information. - @width-breakpoint-desktop-wide: 1200px; - // Extra wide desktop breakpoint -// Number is prone to change with new information. - @width-breapoint-desktop-extrawide: 2000px; -- To view, visit https://gerrit.wikimedia.org/r/390363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id92c426ebd3bb0f4c1a81c7f4be87a51e2ccffee Gerrit-PatchSet: 1 Gerrit-Project: wikimedia-ui-base Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Re-arrange intro section
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390361 ) Change subject: README: Re-arrange intro section .. README: Re-arrange intro section Bug: T179111 Change-Id: I7faae1ca31a5670d2a4582798455cf33a8d65769 --- M README.md 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/61/390361/1 diff --git a/README.md b/README.md index 8248e63..67b002a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,16 @@ OOjs UI = -OOjs UI is a modern JavaScript UI library. It provides common widgets, layouts, dialogs and icons that are ready to use, as well as many useful and convenient classes for constructing custom user interfaces. It is the standard user-interface library in Wikimedia Foundation Web products, having been originally created for use by [VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for its entire user interface. +OOjs UI is a modern JavaScript UI library. It provides: + +* Common widgets, layouts, and dialogs +* Classes to create custom interfaces +* Support for RTL +* Theme-ability though LESS variables +* Icons +* Accessibility features + +It is the standard library for Web products at the Wikimedia Foundation, having been originally created for use by [VisualEditor](https://www.mediawiki.org/wiki/VisualEditor). Quick start -- To view, visit https://gerrit.wikimedia.org/r/390361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7faae1ca31a5670d2a4582798455cf33a8d65769 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Add "Community" section
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390181 ) Change subject: README: Add "Community" section .. README: Add "Community" section Bug: T179111 Change-Id: Ic63bdaa25f2922d5345da2ad4f1a2d61b62d87a2 --- M README.md 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/81/390181/1 diff --git a/README.md b/README.md index de5ac94..5433135 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,16 @@ A new version of the library is released most weeks on Tuesdays. +Community +- + +Get updates, ask questions and join the discussion with maintainers and contributors. + +* Join the Wikimedia Developers mailing list, [wikitech-l](https://lists.wikimedia.org/mailman/listinfo/wikitech-l). +* Chat with the contributors on `#wikimedia-dev` on `irc.freenode.net`. +* Ask questions on [StackOverflow](https://stackoverflow.com/tags/oojs-ui/info). +* Watchlist the [documentation](https://www.mediawiki.org/wiki/OOjs_UI) on Mediawiki to stay updated. + Versioning -- -- To view, visit https://gerrit.wikimedia.org/r/390181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic63bdaa25f2922d5345da2ad4f1a2d61b62d87a2 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: statsbar: Update colors according to WikmediaUI palette
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/388379 ) Change subject: statsbar: Update colors according to WikmediaUI palette .. statsbar: Update colors according to WikmediaUI palette Change-Id: Ia3a9459b18c0880bd0a93338e711e76f0e612f2e --- M resources/css/ext.translate.statsbar.css 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/79/388379/1 diff --git a/resources/css/ext.translate.statsbar.css b/resources/css/ext.translate.statsbar.css index 90d4cc3..e2a6677 100644 --- a/resources/css/ext.translate.statsbar.css +++ b/resources/css/ext.translate.statsbar.css @@ -13,15 +13,15 @@ } .tux-statsbar .tux-proofread { - background-color: #23567f; + background-color: #ebcc6e; } .tux-statsbar .tux-translated { - background-color: #3a89c9; + background-color: #36c; } .tux-statsbar .tux-fuzzy { - background-color: #ebcc6e; + background-color: #fc3; } .tux-statsbar .tux-untranslated { -- To view, visit https://gerrit.wikimedia.org/r/388379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3a9459b18c0880bd0a93338e711e76f0e612f2e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: onMenuToggle: isVilible is the state of the menu, not an eve...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/387767 ) Change subject: onMenuToggle: isVilible is the state of the menu, not an event obejct .. onMenuToggle: isVilible is the state of the menu, not an event obejct Follows-up on I2ce131cdafed5feaf8f3e42164801c042c844711 Change-Id: I0cc7e7592941110d0c56dcd98937e8686030f37b --- M src/widgets/CapsuleMultiselectWidget.js M src/widgets/ComboBoxInputWidget.js M src/widgets/DropdownWidget.js 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/67/387767/1 diff --git a/src/widgets/CapsuleMultiselectWidget.js b/src/widgets/CapsuleMultiselectWidget.js index f4a398a..5509050 100644 --- a/src/widgets/CapsuleMultiselectWidget.js +++ b/src/widgets/CapsuleMultiselectWidget.js @@ -734,7 +734,7 @@ * Handle menu toggle events. * * @private - * @param {boolean} isVisible Menu toggle event + * @param {boolean} isVisible Open state of the menu */ OO.ui.CapsuleMultiselectWidget.prototype.onMenuToggle = function ( isVisible ) { this.$element.toggleClass( 'oo-ui-capsuleMultiselectWidget-open', isVisible ); diff --git a/src/widgets/ComboBoxInputWidget.js b/src/widgets/ComboBoxInputWidget.js index 10ff531..f4206f3 100644 --- a/src/widgets/ComboBoxInputWidget.js +++ b/src/widgets/ComboBoxInputWidget.js @@ -224,7 +224,7 @@ * Handle menu toggle events. * * @private - * @param {boolean} isVisible Menu toggle event + * @param {boolean} isVisible Open state of the menu */ OO.ui.ComboBoxInputWidget.prototype.onMenuToggle = function ( isVisible ) { this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-open', isVisible ); diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js index ca96223..09a157f 100644 --- a/src/widgets/DropdownWidget.js +++ b/src/widgets/DropdownWidget.js @@ -154,7 +154,7 @@ * Handle menu toggle events. * * @private - * @param {boolean} isVisible Menu toggle event + * @param {boolean} isVisible Open state of the menu */ OO.ui.DropdownWidget.prototype.onMenuToggle = function ( isVisible ) { this.$element.toggleClass( 'oo-ui-dropdownWidget-open', isVisible ); -- To view, visit https://gerrit.wikimedia.org/r/387767 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cc7e7592941110d0c56dcd98937e8686030f37b Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: EditIndexPage: Remove unused var
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386796 ) Change subject: EditIndexPage: Remove unused var .. EditIndexPage: Remove unused var Change-Id: I0544980ff6d7cbeeafb5ddf1d8c4ccded52aed50 --- M includes/index/EditIndexPage.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/96/386796/1 diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php index 862f150..dec515b 100644 --- a/includes/index/EditIndexPage.php +++ b/includes/index/EditIndexPage.php @@ -101,7 +101,6 @@ 'options' => $options ] ); } else { - $inputAttributes['classes'][] = 'prp-input-' . $field->getType(); if ( $field->getSize() > 1 ) { $input = new MultilineTextInputWidget( $inputOptions + [ 'rows' => $field->getSize() -- To view, visit https://gerrit.wikimedia.org/r/386796 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0544980ff6d7cbeeafb5ddf1d8c4ccded52aed50 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Use MultilineTextInputWidget instead of the deprecated multi...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383547 ) Change subject: Use MultilineTextInputWidget instead of the deprecated multiline config .. Use MultilineTextInputWidget instead of the deprecated multiline config Needs I1ff698a3321ecbb9e28ca4c31d424767bc9d6f4e from OOUI to be in MediaWiki core. Bug: T177529 Change-Id: I81e50d9585bac8323adf7b8fe7f2e0f662c556e6 --- M includes/index/EditIndexPage.php 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/47/383547/1 diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php index 9f0603e..18a9056 100644 --- a/includes/index/EditIndexPage.php +++ b/includes/index/EditIndexPage.php @@ -101,13 +101,21 @@ ] ); } else { $inputAttributes['classes'][] = 'prp-input-' . $field->getType(); - $input = new TextInputWidget( $inputOptions + [ - 'type' => $field->getType() === 'number' && ( $val === '' || is_numeric( $val ) ) - ? 'number' - : 'text', - 'multiline' => $field->getSize() > 1, - 'rows' => $field->getSize() - ] ); + if ( $field->getSize() > 1 ) { + $input = new MultilineTextInputWidget( $inputOptions + [ + 'type' => $field->getType() === 'number' && ( $val === '' || is_numeric( $val ) ) + ? 'number' + : 'text', + 'rows' => $field->getSize() + ] ); + } else { + $input = new TextInputWidget( $inputOptions + [ + 'type' => $field->getType() === 'number' && ( $val === '' || is_numeric( $val ) ) + ? 'number' + : 'text', + 'rows' => $field->getSize() + ] ); + } } $fieldLayoutArgs = [ -- To view, visit https://gerrit.wikimedia.org/r/383547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81e50d9585bac8323adf7b8fe7f2e0f662c556e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use MultilineTextInputWidget instead of the deprecated multi...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383544 ) Change subject: Use MultilineTextInputWidget instead of the deprecated multiline config .. Use MultilineTextInputWidget instead of the deprecated multiline config Needs I1ff698a3321ecbb9e28ca4c31d424767bc9d6f4e from OOUI to be in MediaWiki core. Bug: T177529 Change-Id: I0e7dbf189841f72ef1cc6b4c0db2c96a87625222 --- M includes/htmlform/fields/HTMLTextAreaField.php M includes/widget/UsersMultiselectWidget.php 2 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/44/383544/1 diff --git a/includes/htmlform/fields/HTMLTextAreaField.php b/includes/htmlform/fields/HTMLTextAreaField.php index 480c5bb..e6963d5 100644 --- a/includes/htmlform/fields/HTMLTextAreaField.php +++ b/includes/htmlform/fields/HTMLTextAreaField.php @@ -92,10 +92,9 @@ $this->getAttributes( $allowedParams ) ); - return new OOUI\TextInputWidget( [ + return new OOUI\MultilineTextInputWidget( [ 'id' => $this->mID, 'name' => $this->mName, - 'multiline' => true, 'value' => $value, 'rows' => $this->getRows(), ] + $attribs ); diff --git a/includes/widget/UsersMultiselectWidget.php b/includes/widget/UsersMultiselectWidget.php index 999cb6a..9052c5e 100644 --- a/includes/widget/UsersMultiselectWidget.php +++ b/includes/widget/UsersMultiselectWidget.php @@ -38,9 +38,8 @@ $this->inputPlaceholder = $config['placeholder']; } - $textarea = new TextInputWidget( [ + $textarea = new MultilineTextInputWidget( [ 'name' => $this->inputName, - 'multiline' => true, 'value' => implode( "\n", $this->usersArray ), 'rows' => 25, ] ); -- To view, visit https://gerrit.wikimedia.org/r/383544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e7dbf189841f72ef1cc6b4c0db2c96a87625222 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [WIP] PHP: Implement SearchInputWidget, deprecate search option
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/381962 ) Change subject: [WIP] PHP: Implement SearchInputWidget, deprecate search option .. [WIP] PHP: Implement SearchInputWidget, deprecate search option Change-Id: I31caa6a84015c45e313c317aaac0cfbe6db48831 --- M demos/pages/widgets.php A php/widgets/SearchInputWidget.php M php/widgets/TextInputWidget.php 3 files changed, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/62/381962/1 diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php index 68a6456..8126aba 100644 --- a/demos/pages/widgets.php +++ b/demos/pages/widgets.php @@ -368,6 +368,13 @@ ] ), new OOUI\FieldLayout( + new OOUI\SearchInputWidget(), + [ + 'label' => "SearchInputWidget \xE2\x80\x8E", + 'align' => 'top' + ] + ), + new OOUI\FieldLayout( new OOUI\TextInputWidget( [ 'value' => 'Access key: S', 'accessKey' => 's' diff --git a/php/widgets/SearchInputWidget.php b/php/widgets/SearchInputWidget.php new file mode 100644 index 000..7310d70 --- /dev/null +++ b/php/widgets/SearchInputWidget.php @@ -0,0 +1,56 @@ + 'search', + 'readOnly' => false, + 'autofocus' => false, + 'required' => false, + 'autocomplete' => true, + ], $config ); + + if ( !array_key_exists( 'icon', $config ) ) { + $config['icon'] = 'search'; + } + + // Parent constructor + parent::__construct( $config ); + } +} diff --git a/php/widgets/TextInputWidget.php b/php/widgets/TextInputWidget.php index 37ed3e1..f75e9e7 100644 --- a/php/widgets/TextInputWidget.php +++ b/php/widgets/TextInputWidget.php @@ -188,7 +188,8 @@ 'password', 'email', 'url', - 'number' + 'number', + 'search' ]; return in_array( $config['type'], $allowedTypes ) ? $config['type'] : 'text'; } -- To view, visit https://gerrit.wikimedia.org/r/381962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31caa6a84015c45e313c317aaac0cfbe6db48831 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: New build with added `alt` attributes and further a11y impro...
Prtksxna has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379461 ) Change subject: New build with added `alt` attributes and further a11y improvments .. New build with added `alt` attributes and further a11y improvments Bug: T173629 Change-Id: I3553ddf430720ffcad033632d416562a25674629 --- M build/content.html M build/faq.html M build/fr/content.html M build/fr/faq.html M build/fr/index.html M build/fr/privacy.html M build/fr/stories.html M build/index.html M build/privacy.html M build/stories.html M build/stylesheets/master.css 11 files changed, 11 insertions(+), 11 deletions(-) Approvals: Prtksxna: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/379461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3553ddf430720ffcad033632d416562a25674629 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport Gerrit-Branch: master Gerrit-Owner: VolkerEGerrit-Reviewer: Prtksxna Gerrit-Reviewer: Siddparmar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use findFirstSelectableItem instead of getFirstSelectableItem
Prtksxna has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376172 ) Change subject: Use findFirstSelectableItem instead of getFirstSelectableItem .. Use findFirstSelectableItem instead of getFirstSelectableItem Follows-up on Ic12be404eba490e5ce748f0d754a807e12f6ba76 Bug: T76630 Change-Id: I394cf839039961a5bf4794d07662ef2300efa67f --- M src/layouts/BookletLayout.js M src/layouts/IndexLayout.js M src/mixins/LookupElement.js M src/widgets/DropdownInputWidget.js M src/widgets/SelectWidget.js 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js index 8a2364b..5d06c9f 100644 --- a/src/layouts/BookletLayout.js +++ b/src/layouts/BookletLayout.js @@ -566,7 +566,7 @@ */ OO.ui.BookletLayout.prototype.selectFirstSelectablePage = function () { if ( !this.outlineSelectWidget.getSelectedItem() ) { - this.outlineSelectWidget.selectItem( this.outlineSelectWidget.getFirstSelectableItem() ); + this.outlineSelectWidget.selectItem( this.outlineSelectWidget.findFirstSelectableItem() ); } return this; diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js index 47db29f..2dcbceb 100644 --- a/src/layouts/IndexLayout.js +++ b/src/layouts/IndexLayout.js @@ -436,7 +436,7 @@ */ OO.ui.IndexLayout.prototype.selectFirstSelectableTabPanel = function () { if ( !this.tabSelectWidget.getSelectedItem() ) { - this.tabSelectWidget.selectItem( this.tabSelectWidget.getFirstSelectableItem() ); + this.tabSelectWidget.selectItem( this.tabSelectWidget.findFirstSelectableItem() ); } return this; diff --git a/src/mixins/LookupElement.js b/src/mixins/LookupElement.js index 7323c58..2b334fc 100644 --- a/src/mixins/LookupElement.js +++ b/src/mixins/LookupElement.js @@ -249,7 +249,7 @@ */ OO.ui.mixin.LookupElement.prototype.initializeLookupMenuSelection = function () { if ( this.lookupHighlightFirstItem && !this.lookupMenu.getSelectedItem() ) { - this.lookupMenu.highlightItem( this.lookupMenu.getFirstSelectableItem() ); + this.lookupMenu.highlightItem( this.lookupMenu.findFirstSelectableItem() ); } }; diff --git a/src/widgets/DropdownInputWidget.js b/src/widgets/DropdownInputWidget.js index b292488..124beac 100644 --- a/src/widgets/DropdownInputWidget.js +++ b/src/widgets/DropdownInputWidget.js @@ -97,7 +97,7 @@ value = this.cleanUpValue( value ); // Only allow setting values that are actually present in the dropdown selected = this.dropdownWidget.getMenu().getItemFromData( value ) || - this.dropdownWidget.getMenu().getFirstSelectableItem(); + this.dropdownWidget.getMenu().findFirstSelectableItem(); this.dropdownWidget.getMenu().selectItem( selected ); value = selected ? selected.getData() : ''; OO.ui.DropdownInputWidget.parent.prototype.setValue.call( this, value ); diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index 3a56668..e9a82e9 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -153,7 +153,7 @@ // This widget was focussed, e.g. by the user tabbing to it. // The styles for focus state depend on one of the items being selected. if ( !this.getSelectedItem() ) { - item = this.getFirstSelectableItem(); + item = this.findFirstSelectableItem(); } } else { // One of the options got focussed (and the event bubbled up here). -- To view, visit https://gerrit.wikimedia.org/r/376172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I394cf839039961a5bf4794d07662ef2300efa67f Gerrit-PatchSet: 3 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: PrtksxnaGerrit-Reviewer: Jforrester Gerrit-Reviewer: Prtksxna Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Special:ProtectedPage: Use HTMLForm
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376710 ) Change subject: [WIP] Special:ProtectedPage: Use HTMLForm .. [WIP] Special:ProtectedPage: Use HTMLForm For now I've replicated functions as functionName2() and am returning the form descriptiors from those. TODO: * Why is HTML form showing an error? The red "1" at the top of the form * What to do about the Min/Max(bytes) input? Bug: T117722 Change-Id: Ia964192b50464ebec00e0812e14b804fe91132ca --- M includes/specials/SpecialProtectedpages.php 1 file changed, 171 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/10/376710/1 diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php index 8e20d88..a21461b 100644 --- a/includes/specials/SpecialProtectedpages.php +++ b/includes/specials/SpecialProtectedpages.php @@ -97,9 +97,31 @@ ) { $title = $this->getPageTitle(); + $formDescriptor = [ + 'titlehidden' => [ + 'class' => 'HTMLHiddenField', + 'name' => 'title', + 'value' => $title->getPrefixedDBkey(), + ], + + 'namespace' => $this->getNamespaceMenu2( $namespace ), + 'typemenu' => $this->getTypeMenu2( $type ), + 'levelmenu' => $this->getLevelMenu2( $level ), + + 'expirycheck' => $this->getExpiryCheck2( $indefOnly ), + 'cascadecheck' => $this->getCascadeCheck2( $cascadeOnly ), + 'redirectcheck' => $this->getRedirectCheck2( $noRedirect ), + + 'sizelimit' => $this->getSizeLimit2( $sizetype, $size ), + ]; + $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() ); + $htmlForm + ->setWrapperLegendMsg( 'protectedpages' ) + ->setSubmitText( $this->msg( 'protectedpages-submit' )->text() ); + return Xml::openElement( 'form', [ 'method' => 'get', 'action' => wfScript() ] ) . Xml::openElement( 'fieldset' ) . - Xml::element( 'legend', [], $this->msg( 'protectedpages' )->text() ) . + Xml::element( 'legend', [], $this->msg( 'prozotectedpages' )->text() ) . Html::hidden( 'title', $title->getPrefixedDBkey() ) . "\n" . $this->getNamespaceMenu( $namespace ) . "\n" . $this->getTypeMenu( $type ) . "\n" . @@ -112,7 +134,8 @@ $this->getSizeLimit( $sizetype, $size ) . "\n" . Xml::submitButton( $this->msg( 'protectedpages-submit' )->text() ) . "\n" . Xml::closeElement( 'fieldset' ) . - Xml::closeElement( 'form' ); + Xml::closeElement( 'form' ) . + $htmlForm->prepareForm()->getHTML( true ); } /** @@ -139,6 +162,26 @@ } /** +* Prepare the namespace filter drop-down; standard namespace +* selector, sans the MediaWiki namespace +* +* @param string|null $namespace Pre-select namespace +* @return TODO +*/ + protected function getNamespaceMenu2( $namespace = null ) { + return [ + 'class' => 'HTMLSelectNamespace', + 'name' => 'namespace', + 'id' => 'namespace', + 'cssclass' => 'namespaceselector', + 'selected' => $namespace, + 'all' => '', + 'label' => $this->msg( 'namespace' )->text(), + ]; + } + + + /** * @param bool $indefOnly * @return string Formatted HTML */ @@ -149,6 +192,20 @@ 'indefonly', $indefOnly ) . "\n"; + } + + /** +* @param bool $indefOnly +* @return TODO +*/ + protected function getExpiryCheck2( $indefOnly ) { + return [ + 'type' => 'check', + 'label' => $this->msg( 'protectedpages-indef' )->text(), + 'name' => 'indefonly', + 'id' => 'indefonly', + 'value' => $indefOnly + ]; } /** @@ -165,6 +222,20 @@ } /** +* @param bool $cascadeOnly +* @return TODO +*/ + protected function getCascadeCheck2( $cascadeOnly ) { + return [ + 'type' => 'check', + 'label' => $this->msg( 'protectedpages-cascade'
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] SelectWidget: Remove getHighlightedItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376503 ) Change subject: [BREAKING CHANGE] SelectWidget: Remove getHighlightedItem .. [BREAKING CHANGE] SelectWidget: Remove getHighlightedItem Follows-up on I7213476574a62e54e05d4ffa8539b2f881acb214 Bug: T76630 Change-Id: I6c8abad099e299bd40a13e6ce9eba5c6432b939b --- M src/widgets/SelectWidget.js 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/03/376503/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index d3c382b..f1770a4 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -548,17 +548,6 @@ }; /** - * Get highlighted item. - * - * @deprecated 0.23.1 Use {@link #findHighlightedItem} instead. - * @return {OO.ui.OptionWidget|null} Highlighted item, `null` if no item is highlighted - */ -OO.ui.SelectWidget.prototype.getHighlightedItem = function () { - OO.ui.warnDeprecation( 'SelectWidget#getHighlightedItem: Deprecated function. Use findHighlightedItem instead. See T76630.' ); - return this.findHighlightedItem(); -}; - -/** * Toggle pressed state. * * Press is a state that occurs when a user mouses down on an item, but -- To view, visit https://gerrit.wikimedia.org/r/376503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c8abad099e299bd40a13e6ce9eba5c6432b939b Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use findHighlightedItem instead of getHighlightedItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376502 ) Change subject: Use findHighlightedItem instead of getHighlightedItem .. Use findHighlightedItem instead of getHighlightedItem Follows-up on I7213476574a62e54e05d4ffa8539b2f881acb214 Bug: T76630 Change-Id: I32dfc3f9252624edb20ec73be18f63e52378fb43 --- M src/widgets/ComboBoxInputWidget.js M src/widgets/MenuSelectWidget.js M src/widgets/MenuTagMultiselectWidget.js M src/widgets/SearchWidget.js M src/widgets/SelectWidget.js 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/02/376502/1 diff --git a/src/widgets/ComboBoxInputWidget.js b/src/widgets/ComboBoxInputWidget.js index 3ef7793..cfba538 100644 --- a/src/widgets/ComboBoxInputWidget.js +++ b/src/widgets/ComboBoxInputWidget.js @@ -165,7 +165,7 @@ var match = this.menu.getItemFromData( value ); this.menu.selectItem( match ); - if ( this.menu.getHighlightedItem() ) { + if ( this.menu.findHighlightedItem() ) { this.menu.highlightItem( match ); } @@ -213,7 +213,7 @@ OO.ui.ComboBoxInputWidget.prototype.onMenuItemsChange = function () { var match = this.menu.getItemFromData( this.getValue() ); this.menu.selectItem( match ); - if ( this.menu.getHighlightedItem() ) { + if ( this.menu.findHighlightedItem() ) { this.menu.highlightItem( match ); } this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-empty', this.menu.isEmpty() ); diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js index 3823021..da3f9f5 100644 --- a/src/widgets/MenuSelectWidget.js +++ b/src/widgets/MenuSelectWidget.js @@ -119,7 +119,7 @@ * @inheritdoc */ OO.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) { - var currentItem = this.getHighlightedItem() || this.getSelectedItem(); + var currentItem = this.findHighlightedItem() || this.getSelectedItem(); if ( !this.isDisabled() && this.isVisible() ) { switch ( e.keyCode ) { diff --git a/src/widgets/MenuTagMultiselectWidget.js b/src/widgets/MenuTagMultiselectWidget.js index 6cca479..ce74690 100644 --- a/src/widgets/MenuTagMultiselectWidget.js +++ b/src/widgets/MenuTagMultiselectWidget.js @@ -148,7 +148,7 @@ OO.ui.MenuTagMultiselectWidget.prototype.addTagFromInput = function () { var inputValue = this.input.getValue(), validated = false, - highlightedItem = this.menu.getHighlightedItem(), + highlightedItem = this.menu.findHighlightedItem(), item = this.menu.getItemFromData( inputValue ); // Override the parent method so we add from the menu diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js index fbce361..4a257d0 100644 --- a/src/widgets/SearchWidget.js +++ b/src/widgets/SearchWidget.js @@ -71,7 +71,7 @@ dir = e.which === OO.ui.Keys.DOWN ? 1 : ( e.which === OO.ui.Keys.UP ? -1 : 0 ); if ( dir ) { - highlightedItem = this.results.getHighlightedItem(); + highlightedItem = this.results.findHighlightedItem(); if ( !highlightedItem ) { highlightedItem = this.results.getSelectedItem(); } @@ -103,7 +103,7 @@ * @param {string} value New value */ OO.ui.SearchWidget.prototype.onQueryEnter = function () { - var highlightedItem = this.results.getHighlightedItem(); + var highlightedItem = this.results.findHighlightedItem(); if ( highlightedItem ) { this.results.chooseItem( highlightedItem ); } diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index 2255c26..d3c382b 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -282,7 +282,7 @@ OO.ui.SelectWidget.prototype.onKeyDown = function ( e ) { var nextItem, handled = false, - currentItem = this.getHighlightedItem() || this.getSelectedItem(); + currentItem = this.findHighlightedItem() || this.getSelectedItem(); if ( !this.isDisabled() && this.isVisible() ) { switch ( e.keyCode ) { @@ -408,7 +408,7 @@ } this.keyPressBufferTimer = setTimeout( this.clearKeyPressBuffer.bind( this ), 1500 ); - item = this.getHighlightedItem() || this.getSelectedItem(); + item = this.findHighlightedItem() || this.getSelectedItem(); if ( this.keyPressBuffer === c ) { // Common (if weird) special case: typing "" will cycle through all -- To view, visit https://gerrit.wikimedia.org/r/376502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32dfc3f9252624edb20ec73be18f63e52378fb43 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] SelectWidget: Rename getHighlightedItem...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376501 ) Change subject: [DEPRECATING CHANGE] SelectWidget: Rename getHighlightedItem to findHighlightedItem .. [DEPRECATING CHANGE] SelectWidget: Rename getHighlightedItem to findHighlightedItem Bug: T76630 Change-Id: I7213476574a62e54e05d4ffa8539b2f881acb214 --- M src/widgets/SelectWidget.js 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/01/376501/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index fc5040a..2255c26 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -532,11 +532,11 @@ }; /** - * Get highlighted item. + * Find highlighted item. * * @return {OO.ui.OptionWidget|null} Highlighted item, `null` if no item is highlighted */ -OO.ui.SelectWidget.prototype.getHighlightedItem = function () { +OO.ui.SelectWidget.prototype.findHighlightedItem = function () { var i, len; for ( i = 0, len = this.items.length; i < len; i++ ) { @@ -548,6 +548,17 @@ }; /** + * Get highlighted item. + * + * @deprecated 0.23.1 Use {@link #findHighlightedItem} instead. + * @return {OO.ui.OptionWidget|null} Highlighted item, `null` if no item is highlighted + */ +OO.ui.SelectWidget.prototype.getHighlightedItem = function () { + OO.ui.warnDeprecation( 'SelectWidget#getHighlightedItem: Deprecated function. Use findHighlightedItem instead. See T76630.' ); + return this.findHighlightedItem(); +}; + +/** * Toggle pressed state. * * Press is a state that occurs when a user mouses down on an item, but -- To view, visit https://gerrit.wikimedia.org/r/376501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7213476574a62e54e05d4ffa8539b2f881acb214 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] SelectWidget: Remove getRelativeSelectable...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376185 ) Change subject: [BREAKING CHANGE] SelectWidget: Remove getRelativeSelectableItem .. [BREAKING CHANGE] SelectWidget: Remove getRelativeSelectableItem Follows-up on I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5 Bug: T76630 Change-Id: I68bd2899cb2a8d6f2ff0dcc167028595a5996c60 --- M src/widgets/SelectWidget.js 1 file changed, 0 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/85/376185/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index 7aad00a..b1570a8 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -796,24 +796,6 @@ }; /** - * Get an option by its position relative to the specified item (or to the start of the option array, - * if item is `null`). The direction in which to search through the option array is specified with a - * number: -1 for reverse (the default) or 1 for forward. The method will return an option, or - * `null` if there are no options in the array. - * - * @deprecated 0.24.0 Use {@link #findRelativeSelectableItem} instead - * @param {OO.ui.OptionWidget|null} item Item to describe the start position, or `null` to start at the beginning of the array. - * @param {number} direction Direction to move in: -1 to move backward, 1 to move forward - * @param {Function} [filter] Only consider items for which this function returns - * true. Function takes an OO.ui.OptionWidget and returns a boolean. - * @return {OO.ui.OptionWidget|null} Item at position, `null` if there are no items in the select - */ -OO.ui.SelectWidget.prototype.getRelativeSelectableItem = function ( item, direction, filter ) { - OO.ui.warnDeprecation( 'SelectWidget#getRelativeSelectableItem: Deprecated function. Use findRelativeSelectableItem instead. See T76630.' ); - return this.findRelativeSelectableItem( item, direction, filter ); -}; - -/** * Get the next selectable item or `null` if there are no selectable items. * Disabled options and menu-section markers and breaks are not selectable. * -- To view, visit https://gerrit.wikimedia.org/r/376185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68bd2899cb2a8d6f2ff0dcc167028595a5996c60 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] SelectWidget: Rename getRelativeSelecta...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376183 ) Change subject: [DEPRECATING CHANGE] SelectWidget: Rename getRelativeSelectableItem to findRelativeSelectableItem .. [DEPRECATING CHANGE] SelectWidget: Rename getRelativeSelectableItem to findRelativeSelectableItem Bug: T76630 Change-Id: I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5 --- M src/widgets/SelectWidget.js 1 file changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/376183/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index fc5040a..e4887f7 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -757,7 +757,7 @@ }; /** - * Get an option by its position relative to the specified item (or to the start of the option array, + * Find an option by its position relative to the specified item (or to the start of the option array, * if item is `null`). The direction in which to search through the option array is specified with a * number: -1 for reverse (the default) or 1 for forward. The method will return an option, or * `null` if there are no options in the array. @@ -768,7 +768,7 @@ * true. Function takes an OO.ui.OptionWidget and returns a boolean. * @return {OO.ui.OptionWidget|null} Item at position, `null` if there are no items in the select */ -OO.ui.SelectWidget.prototype.getRelativeSelectableItem = function ( item, direction, filter ) { +OO.ui.SelectWidget.prototype.findRelativeSelectableItem = function ( item, direction, filter ) { var currentIndex, nextIndex, i, increase = direction > 0 ? 1 : -1, len = this.items.length; @@ -796,13 +796,31 @@ }; /** + * Get an option by its position relative to the specified item (or to the start of the option array, + * if item is `null`). The direction in which to search through the option array is specified with a + * number: -1 for reverse (the default) or 1 for forward. The method will return an option, or + * `null` if there are no options in the array. + * + * @deprecated 0.24.0 Use {@link #findRelativeSelectableItem} instead + * @param {OO.ui.OptionWidget|null} item Item to describe the start position, or `null` to start at the beginning of the array. + * @param {number} direction Direction to move in: -1 to move backward, 1 to move forward + * @param {Function} [filter] Only consider items for which this function returns + * true. Function takes an OO.ui.OptionWidget and returns a boolean. + * @return {OO.ui.OptionWidget|null} Item at position, `null` if there are no items in the select + */ +OO.ui.SelectWidget.prototype.getRelativeSelectableItem = function ( item, direction, filter ) { + OO.ui.warnDeprecation( 'SelectWidget#getRelativeSelectableItem: Deprecated function. Use findRelativeSelectableItem instead. See T76630.' ); + return this.findRelativeSelectableItem( item, direction, filter ); +}; + +/** * Get the next selectable item or `null` if there are no selectable items. * Disabled options and menu-section markers and breaks are not selectable. * * @return {OO.ui.OptionWidget|null} Item, `null` if there aren't any selectable items */ OO.ui.SelectWidget.prototype.getFirstSelectableItem = function () { - return this.getRelativeSelectableItem( null, 1 ); + return this.findRelativeSelectableItem( null, 1 ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/376183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Use findRelativeSelectableItem instead of getRela...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376186 ) Change subject: RCFilters: Use findRelativeSelectableItem instead of getRelativeSelectableitem .. RCFilters: Use findRelativeSelectableItem instead of getRelativeSelectableitem Change-Id: I92c3fbea22ee59cb6aa9cda994f43752973924e0 Depends-on: I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5 Bug: T76630 --- M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/86/376186/1 diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js index 07d4506..19a2490 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js @@ -321,12 +321,12 @@ case OO.ui.Keys.UP: case OO.ui.Keys.LEFT: // Get the next item - nextItem = this.getRelativeSelectableItem( currentItem, -1 ); + nextItem = this.findRelativeSelectableItem( currentItem, -1 ); break; case OO.ui.Keys.DOWN: case OO.ui.Keys.RIGHT: // Get the next item - nextItem = this.getRelativeSelectableItem( currentItem, 1 ); + nextItem = this.findRelativeSelectableItem( currentItem, 1 ); break; } -- To view, visit https://gerrit.wikimedia.org/r/376186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92c3fbea22ee59cb6aa9cda994f43752973924e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use findRelativeSelectableItem instead of getRelativeSelecta...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376184 ) Change subject: Use findRelativeSelectableItem instead of getRelativeSelectableItem .. Use findRelativeSelectableItem instead of getRelativeSelectableItem Follows-up on I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5 Bug: T76630 Change-Id: Ic0895ceb11ec0101de4d41b47ce36257ac985fcb --- M src/widgets/SearchWidget.js M src/widgets/SelectWidget.js 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/84/376184/1 diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js index fbce361..7f8f519 100644 --- a/src/widgets/SearchWidget.js +++ b/src/widgets/SearchWidget.js @@ -75,7 +75,7 @@ if ( !highlightedItem ) { highlightedItem = this.results.getSelectedItem(); } - nextItem = this.results.getRelativeSelectableItem( highlightedItem, dir ); + nextItem = this.results.findRelativeSelectableItem( highlightedItem, dir ); this.results.highlightItem( nextItem ); nextItem.scrollElementIntoView(); } diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index e4887f7..7aad00a 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -296,13 +296,13 @@ case OO.ui.Keys.UP: case OO.ui.Keys.LEFT: this.clearKeyPressBuffer(); - nextItem = this.getRelativeSelectableItem( currentItem, -1 ); + nextItem = this.findRelativeSelectableItem( currentItem, -1 ); handled = true; break; case OO.ui.Keys.DOWN: case OO.ui.Keys.RIGHT: this.clearKeyPressBuffer(); - nextItem = this.getRelativeSelectableItem( currentItem, 1 ); + nextItem = this.findRelativeSelectableItem( currentItem, 1 ); handled = true; break; case OO.ui.Keys.ESCAPE: @@ -414,7 +414,7 @@ // Common (if weird) special case: typing "" will cycle through all // the items beginning with "x". if ( item ) { - item = this.getRelativeSelectableItem( item, 1 ); + item = this.findRelativeSelectableItem( item, 1 ); } } else { this.keyPressBuffer += c; @@ -422,7 +422,7 @@ filter = this.getItemMatcher( this.keyPressBuffer, false ); if ( !item || !filter( item ) ) { - item = this.getRelativeSelectableItem( item, 1, filter ); + item = this.findRelativeSelectableItem( item, 1, filter ); } if ( item ) { if ( this.isVisible() && item.constructor.static.highlightable ) { -- To view, visit https://gerrit.wikimedia.org/r/376184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0895ceb11ec0101de4d41b47ce36257ac985fcb Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: SelectWidget: Rename getHighlightedItem to findHighlightedItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376182 ) Change subject: SelectWidget: Rename getHighlightedItem to findHighlightedItem .. SelectWidget: Rename getHighlightedItem to findHighlightedItem No need for deprecation or breaking change since this is not being used anywhere else. Bug: T76630 Change-Id: If5d05ace671c028eb27a19913fd3b6cb6704fbed --- M src/widgets/ComboBoxInputWidget.js M src/widgets/MenuSelectWidget.js M src/widgets/MenuTagMultiselectWidget.js M src/widgets/SearchWidget.js M src/widgets/SelectWidget.js 5 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/82/376182/1 diff --git a/src/widgets/ComboBoxInputWidget.js b/src/widgets/ComboBoxInputWidget.js index 3ef7793..cfba538 100644 --- a/src/widgets/ComboBoxInputWidget.js +++ b/src/widgets/ComboBoxInputWidget.js @@ -165,7 +165,7 @@ var match = this.menu.getItemFromData( value ); this.menu.selectItem( match ); - if ( this.menu.getHighlightedItem() ) { + if ( this.menu.findHighlightedItem() ) { this.menu.highlightItem( match ); } @@ -213,7 +213,7 @@ OO.ui.ComboBoxInputWidget.prototype.onMenuItemsChange = function () { var match = this.menu.getItemFromData( this.getValue() ); this.menu.selectItem( match ); - if ( this.menu.getHighlightedItem() ) { + if ( this.menu.findHighlightedItem() ) { this.menu.highlightItem( match ); } this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-empty', this.menu.isEmpty() ); diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js index 3823021..da3f9f5 100644 --- a/src/widgets/MenuSelectWidget.js +++ b/src/widgets/MenuSelectWidget.js @@ -119,7 +119,7 @@ * @inheritdoc */ OO.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) { - var currentItem = this.getHighlightedItem() || this.getSelectedItem(); + var currentItem = this.findHighlightedItem() || this.getSelectedItem(); if ( !this.isDisabled() && this.isVisible() ) { switch ( e.keyCode ) { diff --git a/src/widgets/MenuTagMultiselectWidget.js b/src/widgets/MenuTagMultiselectWidget.js index 6cca479..ce74690 100644 --- a/src/widgets/MenuTagMultiselectWidget.js +++ b/src/widgets/MenuTagMultiselectWidget.js @@ -148,7 +148,7 @@ OO.ui.MenuTagMultiselectWidget.prototype.addTagFromInput = function () { var inputValue = this.input.getValue(), validated = false, - highlightedItem = this.menu.getHighlightedItem(), + highlightedItem = this.menu.findHighlightedItem(), item = this.menu.getItemFromData( inputValue ); // Override the parent method so we add from the menu diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js index fbce361..4a257d0 100644 --- a/src/widgets/SearchWidget.js +++ b/src/widgets/SearchWidget.js @@ -71,7 +71,7 @@ dir = e.which === OO.ui.Keys.DOWN ? 1 : ( e.which === OO.ui.Keys.UP ? -1 : 0 ); if ( dir ) { - highlightedItem = this.results.getHighlightedItem(); + highlightedItem = this.results.findHighlightedItem(); if ( !highlightedItem ) { highlightedItem = this.results.getSelectedItem(); } @@ -103,7 +103,7 @@ * @param {string} value New value */ OO.ui.SearchWidget.prototype.onQueryEnter = function () { - var highlightedItem = this.results.getHighlightedItem(); + var highlightedItem = this.results.findHighlightedItem(); if ( highlightedItem ) { this.results.chooseItem( highlightedItem ); } diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index fc5040a..f1770a4 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -282,7 +282,7 @@ OO.ui.SelectWidget.prototype.onKeyDown = function ( e ) { var nextItem, handled = false, - currentItem = this.getHighlightedItem() || this.getSelectedItem(); + currentItem = this.findHighlightedItem() || this.getSelectedItem(); if ( !this.isDisabled() && this.isVisible() ) { switch ( e.keyCode ) { @@ -408,7 +408,7 @@ } this.keyPressBufferTimer = setTimeout( this.clearKeyPressBuffer.bind( this ), 1500 ); - item = this.getHighlightedItem() || this.getSelectedItem(); + item = this.findHighlightedItem() || this.getSelectedItem(); if ( this.keyPressBuffer === c ) { // Common (if weird) special case: typing "" will cycle through all @@ -532,11 +532,11 @@ }; /** - * Get highlighted item. + * Find highlighted item. * * @return {OO.ui.OptionWidget|null} Highlighted item, `null` if no item is highlighted */
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: apisandbox.js: Use findFirstSelectableitem instead of getFir...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376176 ) Change subject: apisandbox.js: Use findFirstSelectableitem instead of getFirstSelectableItem .. apisandbox.js: Use findFirstSelectableitem instead of getFirstSelectableItem Bug: T76630 Change-Id: Iaf2c9cae0bcd6dd6c486f84b7cf1e2a640fb38f8 Depends-on: Ic12be404eba490e5ce748f0d754a807e12f6ba76 --- M resources/src/mediawiki.special/mediawiki.special.apisandbox.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/376176/1 diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js index 7e9ad7f..9e8d4f4 100644 --- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js +++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js @@ -1072,7 +1072,7 @@ selectedLabel = selectedLabel.text(); } menu.clearItems().addItems( formatItems ); - menu.chooseItem( menu.getItemFromLabel( selectedLabel ) || menu.getFirstSelectableItem() ); + menu.chooseItem( menu.getItemFromLabel( selectedLabel ) || menu.findFirstSelectableItem() ); // Fire the event to update field visibilities Util.onFormatDropdownChange(); -- To view, visit https://gerrit.wikimedia.org/r/376176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf2c9cae0bcd6dd6c486f84b7cf1e2a640fb38f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use findFirstSelectableitem instead of getFirstSelectableItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376177 ) Change subject: Use findFirstSelectableitem instead of getFirstSelectableItem .. Use findFirstSelectableitem instead of getFirstSelectableItem Depends-on: Ic12be404eba490e5ce748f0d754a807e12f6ba76 Bug: T76630 Change-Id: I535d9a8acb70b3dcd747683368260d08a0a155f0 --- M demos/ve/ve.demo.SurfaceContainer.js M src/ui/widgets/ve.ui.LanguageSearchWidget.js 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/77/376177/1 diff --git a/demos/ve/ve.demo.SurfaceContainer.js b/demos/ve/ve.demo.SurfaceContainer.js index c16742b..2203dcd 100644 --- a/demos/ve/ve.demo.SurfaceContainer.js +++ b/demos/ve/ve.demo.SurfaceContainer.js @@ -106,7 +106,7 @@ this.pageMenu.selectItem( this.pageMenu.getItemFromData( page ) || - this.pageMenu.getFirstSelectableItem() + this.pageMenu.findFirstSelectableItem() ); }; diff --git a/src/ui/widgets/ve.ui.LanguageSearchWidget.js b/src/ui/widgets/ve.ui.LanguageSearchWidget.js index f37b5e6..2316c5a 100644 --- a/src/ui/widgets/ve.ui.LanguageSearchWidget.js +++ b/src/ui/widgets/ve.ui.LanguageSearchWidget.js @@ -126,6 +126,6 @@ this.results.addItems( items ); if ( hasQuery ) { - this.results.highlightItem( this.results.getFirstSelectableItem() ); + this.results.highlightItem( this.results.findFirstSelectableItem() ); } }; -- To view, visit https://gerrit.wikimedia.org/r/376177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I535d9a8acb70b3dcd747683368260d08a0a155f0 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use findFirstSelectableitem instead of getFirstSelectableItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376175 ) Change subject: Use findFirstSelectableitem instead of getFirstSelectableItem .. Use findFirstSelectableitem instead of getFirstSelectableItem Depends-on: Ic12be404eba490e5ce748f0d754a807e12f6ba76 Bug: T76630 Change-Id: I7daccf8620ec43a56183fd455048a1f2c5f71f26 --- M modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/75/376175/1 diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js index 6b8ae32..c9c71d8 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js @@ -181,6 +181,6 @@ this.results.addItems( items ); if ( hasQuery ) { - this.results.highlightItem( this.results.getFirstSelectableItem() ); + this.results.highlightItem( this.results.findFirstSelectableItem() ); } }; -- To view, visit https://gerrit.wikimedia.org/r/376175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7daccf8620ec43a56183fd455048a1f2c5f71f26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Use findFirstSelectableitem instead of getFirstSelectableItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376174 ) Change subject: Use findFirstSelectableitem instead of getFirstSelectableItem .. Use findFirstSelectableitem instead of getFirstSelectableItem Depends-on: Ic12be404eba490e5ce748f0d754a807e12f6ba76 Bug: T76630 Change-Id: Iba797c12bc4cd8ece93f44d67cd1aef36bd37a64 --- M modules/widgets/ext.templateDataGenerator.languageSearchWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData refs/changes/74/376174/1 diff --git a/modules/widgets/ext.templateDataGenerator.languageSearchWidget.js b/modules/widgets/ext.templateDataGenerator.languageSearchWidget.js index acc080a..4405539 100644 --- a/modules/widgets/ext.templateDataGenerator.languageSearchWidget.js +++ b/modules/widgets/ext.templateDataGenerator.languageSearchWidget.js @@ -121,7 +121,7 @@ this.results.addItems( items ); if ( hasQuery ) { - this.results.highlightItem( this.results.getFirstSelectableItem() ); + this.results.highlightItem( this.results.findFirstSelectableItem() ); } }; -- To view, visit https://gerrit.wikimedia.org/r/376174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba797c12bc4cd8ece93f44d67cd1aef36bd37a64 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use findFirstSelectableItem instead of getFirstSelectableItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376172 ) Change subject: Use findFirstSelectableItem instead of getFirstSelectableItem .. Use findFirstSelectableItem instead of getFirstSelectableItem Follows-up on Ic12be404eba490e5ce748f0d754a807e12f6ba76 Bug: T76630 Change-Id: I394cf839039961a5bf4794d07662ef2300efa67f --- M src/layouts/BookletLayout.js M src/layouts/IndexLayout.js M src/mixins/LookupElement.js M src/widgets/DropdownInputWidget.js M src/widgets/SelectWidget.js 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/72/376172/1 diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js index 443a3f2..4d26639 100644 --- a/src/layouts/BookletLayout.js +++ b/src/layouts/BookletLayout.js @@ -566,7 +566,7 @@ */ OO.ui.BookletLayout.prototype.selectFirstSelectablePage = function () { if ( !this.outlineSelectWidget.getSelectedItem() ) { - this.outlineSelectWidget.selectItem( this.outlineSelectWidget.getFirstSelectableItem() ); + this.outlineSelectWidget.selectItem( this.outlineSelectWidget.findFirstSelectableItem() ); } return this; diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js index 47db29f..2dcbceb 100644 --- a/src/layouts/IndexLayout.js +++ b/src/layouts/IndexLayout.js @@ -436,7 +436,7 @@ */ OO.ui.IndexLayout.prototype.selectFirstSelectableTabPanel = function () { if ( !this.tabSelectWidget.getSelectedItem() ) { - this.tabSelectWidget.selectItem( this.tabSelectWidget.getFirstSelectableItem() ); + this.tabSelectWidget.selectItem( this.tabSelectWidget.findFirstSelectableItem() ); } return this; diff --git a/src/mixins/LookupElement.js b/src/mixins/LookupElement.js index 7323c58..2b334fc 100644 --- a/src/mixins/LookupElement.js +++ b/src/mixins/LookupElement.js @@ -249,7 +249,7 @@ */ OO.ui.mixin.LookupElement.prototype.initializeLookupMenuSelection = function () { if ( this.lookupHighlightFirstItem && !this.lookupMenu.getSelectedItem() ) { - this.lookupMenu.highlightItem( this.lookupMenu.getFirstSelectableItem() ); + this.lookupMenu.highlightItem( this.lookupMenu.findFirstSelectableItem() ); } }; diff --git a/src/widgets/DropdownInputWidget.js b/src/widgets/DropdownInputWidget.js index b292488..124beac 100644 --- a/src/widgets/DropdownInputWidget.js +++ b/src/widgets/DropdownInputWidget.js @@ -97,7 +97,7 @@ value = this.cleanUpValue( value ); // Only allow setting values that are actually present in the dropdown selected = this.dropdownWidget.getMenu().getItemFromData( value ) || - this.dropdownWidget.getMenu().getFirstSelectableItem(); + this.dropdownWidget.getMenu().findFirstSelectableItem(); this.dropdownWidget.getMenu().selectItem( selected ); value = selected ? selected.getData() : ''; OO.ui.DropdownInputWidget.parent.prototype.setValue.call( this, value ); diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index 945ff38..4eba2f7 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -153,7 +153,7 @@ // This widget was focussed, e.g. by the user tabbing to it. // The styles for focus state depend on one of the items being selected. if ( !this.getSelectedItem() ) { - item = this.getFirstSelectableItem(); + item = this.findFirstSelectableItem(); } } else { // One of the options got focussed (and the event bubbled up here). -- To view, visit https://gerrit.wikimedia.org/r/376172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I394cf839039961a5bf4794d07662ef2300efa67f Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] SelectWidget: Remove getFirstSelectableItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376173 ) Change subject: [BREAKING CHANGE] SelectWidget: Remove getFirstSelectableItem .. [BREAKING CHANGE] SelectWidget: Remove getFirstSelectableItem Follows-up on Ic12be404eba490e5ce748f0d754a807e12f6ba76 Bug: T76630 Change-Id: I55294dd707df07dff5f799f3be9c0e17a99710a2 --- M src/widgets/SelectWidget.js 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/73/376173/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index 4eba2f7..7fe3601 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -806,17 +806,6 @@ }; /** - * Get the next selectable item or `null` if there are no selectable items. - * Disabled options and menu-section markers and breaks are not selectable. - * - * @deprecated 0.24.0 Use {@link OO.ui.SelectWidget#findFirstSelectableItem} instead. - * @return {OO.ui.OptionWidget|null} Item, `null` if there aren't any selectable items - */ -OO.ui.SelectWidget.prototype.getFirstSelectableItem = function () { - return this.findFirstSelectableItem(); -}; - -/** * Add an array of options to the select. Optionally, an index number can be used to * specify an insertion point. * -- To view, visit https://gerrit.wikimedia.org/r/376173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55294dd707df07dff5f799f3be9c0e17a99710a2 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] SelectWidget: Rename getFirstSelectable...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376171 ) Change subject: [DEPRECATING CHANGE] SelectWidget: Rename getFirstSelectableItem to findFirstSelectableItem .. [DEPRECATING CHANGE] SelectWidget: Rename getFirstSelectableItem to findFirstSelectableItem Bug: T76630 Change-Id: Ic12be404eba490e5ce748f0d754a807e12f6ba76 --- M src/widgets/SelectWidget.js 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/71/376171/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index fc5040a..945ff38 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -796,16 +796,27 @@ }; /** - * Get the next selectable item or `null` if there are no selectable items. + * Find the next selectable item or `null` if there are no selectable items. * Disabled options and menu-section markers and breaks are not selectable. * * @return {OO.ui.OptionWidget|null} Item, `null` if there aren't any selectable items */ -OO.ui.SelectWidget.prototype.getFirstSelectableItem = function () { +OO.ui.SelectWidget.prototype.findFirstSelectableItem = function () { return this.getRelativeSelectableItem( null, 1 ); }; /** + * Get the next selectable item or `null` if there are no selectable items. + * Disabled options and menu-section markers and breaks are not selectable. + * + * @deprecated 0.24.0 Use {@link OO.ui.SelectWidget#findFirstSelectableItem} instead. + * @return {OO.ui.OptionWidget|null} Item, `null` if there aren't any selectable items + */ +OO.ui.SelectWidget.prototype.getFirstSelectableItem = function () { + return this.findFirstSelectableItem(); +}; + +/** * Add an array of options to the select. Optionally, an index number can be used to * specify an insertion point. * -- To view, visit https://gerrit.wikimedia.org/r/376171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic12be404eba490e5ce748f0d754a807e12f6ba76 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: BookletLayout#getClosestPage: Fix version number of deprecation
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376168 ) Change subject: BookletLayout#getClosestPage: Fix version number of deprecation .. BookletLayout#getClosestPage: Fix version number of deprecation Change-Id: I5cd3f11ea78d4d3c1dbc159d5120679426be6a22 --- M src/layouts/BookletLayout.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/68/376168/1 diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js index 443a3f2..8a2364b 100644 --- a/src/layouts/BookletLayout.js +++ b/src/layouts/BookletLayout.js @@ -329,7 +329,7 @@ /** * Get the page closest to the specified page. * - * @deprecated 0.22.6 Use {@link OO.ui.BookletLayout#findClosestPage} instead. + * @deprecated 0.23.0 Use {@link OO.ui.BookletLayout#findClosestPage} instead. * @param {OO.ui.PageLayout} page Page to use as a reference point * @return {OO.ui.PageLayout|null} Page closest to the specified page */ -- To view, visit https://gerrit.wikimedia.org/r/376168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cd3f11ea78d4d3c1dbc159d5120679426be6a22 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Toolgroup: Rename getTargetTool to findTargetTool
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/375940 ) Change subject: Toolgroup: Rename getTargetTool to findTargetTool .. Toolgroup: Rename getTargetTool to findTargetTool No need for deprecation or breaking change since this is a private method that is not being used anywhere else. Bug: T76630 Change-Id: Ife4794b63e3f1f4dc8eaf669a302dbb852d04163 --- M src/ToolGroup.js M src/toolgroups/PopupToolGroup.js 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/40/375940/1 diff --git a/src/ToolGroup.js b/src/ToolGroup.js index ae4da2e..fe866d2 100644 --- a/src/ToolGroup.js +++ b/src/ToolGroup.js @@ -170,7 +170,7 @@ !this.isDisabled() && ( e.which === OO.ui.MouseButtons.LEFT || e.which === OO.ui.Keys.SPACE || e.which === OO.ui.Keys.ENTER ) ) { - this.pressed = this.getTargetTool( e ); + this.pressed = this.findTargetTool( e ); if ( this.pressed ) { this.pressed.setActive( true ); this.getElementDocument().addEventListener( 'mouseup', this.onCapturedMouseKeyUpHandler, true ); @@ -201,7 +201,7 @@ * @param {MouseEvent|KeyboardEvent} e Mouse up or key up event */ OO.ui.ToolGroup.prototype.onMouseKeyUp = function ( e ) { - var tool = this.getTargetTool( e ); + var tool = this.findTargetTool( e ); if ( !this.isDisabled() && this.pressed && this.pressed === tool && @@ -223,7 +223,7 @@ * @param {jQuery.Event} e Mouse over or focus event */ OO.ui.ToolGroup.prototype.onMouseOverFocus = function ( e ) { - var tool = this.getTargetTool( e ); + var tool = this.findTargetTool( e ); if ( this.pressed && this.pressed === tool ) { this.pressed.setActive( true ); @@ -237,7 +237,7 @@ * @param {jQuery.Event} e Mouse out or blur event */ OO.ui.ToolGroup.prototype.onMouseOutBlur = function ( e ) { - var tool = this.getTargetTool( e ); + var tool = this.findTargetTool( e ); if ( this.pressed && this.pressed === tool ) { this.pressed.setActive( false ); @@ -254,7 +254,7 @@ * @param {jQuery.Event} e * @return {OO.ui.Tool|null} Tool, `null` if none was found */ -OO.ui.ToolGroup.prototype.getTargetTool = function ( e ) { +OO.ui.ToolGroup.prototype.findTargetTool = function ( e ) { var tool, $item = $( e.target ).closest( '.oo-ui-tool-link' ); diff --git a/src/toolgroups/PopupToolGroup.js b/src/toolgroups/PopupToolGroup.js index 640b1c6..6691dc5 100644 --- a/src/toolgroups/PopupToolGroup.js +++ b/src/toolgroups/PopupToolGroup.js @@ -123,7 +123,7 @@ OO.ui.PopupToolGroup.prototype.onMouseKeyUp = function ( e ) { // Only close toolgroup when a tool was actually selected if ( - !this.isDisabled() && this.pressed && this.pressed === this.getTargetTool( e ) && + !this.isDisabled() && this.pressed && this.pressed === this.findTargetTool( e ) && ( e.which === OO.ui.MouseButtons.LEFT || e.which === OO.ui.Keys.SPACE || e.which === OO.ui.Keys.ENTER ) ) { this.setActive( false ); -- To view, visit https://gerrit.wikimedia.org/r/375940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife4794b63e3f1f4dc8eaf669a302dbb852d04163 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: SelectFileWidget: Rename getTargetItem to findTargetItem
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/375938 ) Change subject: SelectFileWidget: Rename getTargetItem to findTargetItem .. SelectFileWidget: Rename getTargetItem to findTargetItem No need for deprecation or breaking change since this is a private method that is not being used anywhere else. Bug: T76630 Change-Id: I94484278600c5dd1a0e12de7989c04a8057a93c7 --- M src/widgets/SelectWidget.js 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/38/375938/1 diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js index cc6a700..7d45ef9 100644 --- a/src/widgets/SelectWidget.js +++ b/src/widgets/SelectWidget.js @@ -158,7 +158,7 @@ } else { // One of the options got focussed (and the event bubbled up here). // They can't be tabbed to, but they can be activated using accesskeys. - item = this.getTargetItem( event ); + item = this.findTargetItem( event ); } if ( item ) { @@ -185,7 +185,7 @@ if ( !this.isDisabled() && e.which === OO.ui.MouseButtons.LEFT ) { this.togglePressed( true ); - item = this.getTargetItem( e ); + item = this.findTargetItem( e ); if ( item && item.isSelectable() ) { this.pressItem( item ); this.selecting = item; @@ -207,7 +207,7 @@ this.togglePressed( false ); if ( !this.selecting ) { - item = this.getTargetItem( e ); + item = this.findTargetItem( e ); if ( item && item.isSelectable() ) { this.selecting = item; } @@ -234,7 +234,7 @@ var item; if ( !this.isDisabled() && this.pressed ) { - item = this.getTargetItem( e ); + item = this.findTargetItem( e ); if ( item && item !== this.selecting && item.isSelectable() ) { this.pressItem( item ); this.selecting = item; @@ -254,7 +254,7 @@ return; } if ( !this.isDisabled() ) { - item = this.getTargetItem( e ); + item = this.findTargetItem( e ); this.highlightItem( item && item.isHighlightable() ? item : null ); } return false; @@ -507,7 +507,7 @@ * @param {jQuery.Event} e * @return {OO.ui.OptionWidget|null} Outline item widget, `null` if none was found */ -OO.ui.SelectWidget.prototype.getTargetItem = function ( e ) { +OO.ui.SelectWidget.prototype.findTargetItem = function ( e ) { return $( e.target ).closest( '.oo-ui-optionWidget' ).data( 'oo-ui-optionWidget' ) || null; }; -- To view, visit https://gerrit.wikimedia.org/r/375938 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94484278600c5dd1a0e12de7989c04a8057a93c7 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWTemplateDialog: BookletLayout: Use findClosestPage instead...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/375937 ) Change subject: MWTemplateDialog: BookletLayout: Use findClosestPage instead of getClosestPage .. MWTemplateDialog: BookletLayout: Use findClosestPage instead of getClosestPage Bug: T76630 Depends-on: I068dad8c79c4bda6ea37ab6a1eb6ba72ab6f7dc0 Change-Id: Ib4e380aa6cd0cacbadd42bdf447ddee6443f22ef --- M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/37/375937/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js index d8487a3..866e296 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js @@ -121,7 +121,7 @@ removed.disconnect( this ); } if ( this.loaded && !this.preventReselection && partPage.isActive() ) { - reselect = this.bookletLayout.getClosestPage( partPage ); + reselect = this.bookletLayout.findClosestPage( partPage ); } removePages.push( partPage ); this.bookletLayout.removePages( removePages ); @@ -232,7 +232,7 @@ */ ve.ui.MWTemplateDialog.prototype.onRemoveParameter = function ( param ) { var page = this.bookletLayout.getPage( param.getId() ), - reselect = this.bookletLayout.getClosestPage( page ); + reselect = this.bookletLayout.findClosestPage( page ); this.bookletLayout.removePages( [ page ] ); if ( this.loaded ) { -- To view, visit https://gerrit.wikimedia.org/r/375937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4e380aa6cd0cacbadd42bdf447ddee6443f22ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] BookletLayout: Rename getClosestPage to...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/375935 ) Change subject: [DEPRECATING CHANGE] BookletLayout: Rename getClosestPage to findClosestPage .. [DEPRECATING CHANGE] BookletLayout: Rename getClosestPage to findClosestPage Bug: T76630 Change-Id: I068dad8c79c4bda6ea37ab6a1eb6ba72ab6f7dc0 --- M src/layouts/BookletLayout.js 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/35/375935/1 diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js index a2c4638..443a3f2 100644 --- a/src/layouts/BookletLayout.js +++ b/src/layouts/BookletLayout.js @@ -293,12 +293,12 @@ }; /** - * Get the page closest to the specified page. + * Find the page closest to the specified page. * * @param {OO.ui.PageLayout} page Page to use as a reference point * @return {OO.ui.PageLayout|null} Page closest to the specified page */ -OO.ui.BookletLayout.prototype.getClosestPage = function ( page ) { +OO.ui.BookletLayout.prototype.findClosestPage = function ( page ) { var next, prev, level, pages = this.stackLayout.getItems(), index = pages.indexOf( page ); @@ -327,6 +327,18 @@ }; /** + * Get the page closest to the specified page. + * + * @deprecated 0.22.6 Use {@link OO.ui.BookletLayout#findClosestPage} instead. + * @param {OO.ui.PageLayout} page Page to use as a reference point + * @return {OO.ui.PageLayout|null} Page closest to the specified page + */ +OO.ui.BookletLayout.prototype.getClosestPage = function ( page ) { + OO.ui.warnDeprecation( 'BookletLayout#getClosestPage: Deprecated function. Use findClosestPage instead. See T76630.' ); + return this.findClosestPage( page ); +}; + +/** * Get the outline widget. * * If the booklet is not outlined, the method will return `null`. -- To view, visit https://gerrit.wikimedia.org/r/375935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I068dad8c79c4bda6ea37ab6a1eb6ba72ab6f7dc0 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] Remove BookletLayout#getClosestPage
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/375936 ) Change subject: [BREAKING CHANGE] Remove BookletLayout#getClosestPage .. [BREAKING CHANGE] Remove BookletLayout#getClosestPage Follows-up on I068dad8c79c4bda6ea37ab6a1eb6ba72ab6f7dc0 Bug: T76630 Change-Id: Ie8895480340811e85db440c213faddbe97202fd8 --- M src/layouts/BookletLayout.js 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/36/375936/1 diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js index 443a3f2..33d9fc3 100644 --- a/src/layouts/BookletLayout.js +++ b/src/layouts/BookletLayout.js @@ -327,18 +327,6 @@ }; /** - * Get the page closest to the specified page. - * - * @deprecated 0.22.6 Use {@link OO.ui.BookletLayout#findClosestPage} instead. - * @param {OO.ui.PageLayout} page Page to use as a reference point - * @return {OO.ui.PageLayout|null} Page closest to the specified page - */ -OO.ui.BookletLayout.prototype.getClosestPage = function ( page ) { - OO.ui.warnDeprecation( 'BookletLayout#getClosestPage: Deprecated function. Use findClosestPage instead. See T76630.' ); - return this.findClosestPage( page ); -}; - -/** * Get the outline widget. * * If the booklet is not outlined, the method will return `null`. -- To view, visit https://gerrit.wikimedia.org/r/375936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8895480340811e85db440c213faddbe97202fd8 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: UploadFromUrl: Fix typo
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/374976 ) Change subject: UploadFromUrl: Fix typo .. UploadFromUrl: Fix typo Change-Id: I4df0db5b4a0df0191e1eaa305fc49f1959c4a354 --- M includes/upload/UploadFromUrl.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/374976/1 diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php index 7d697a1..f5367bb 100644 --- a/includes/upload/UploadFromUrl.php +++ b/includes/upload/UploadFromUrl.php @@ -287,7 +287,7 @@ wfDebugLog( 'fileupload', $status ); if ( $status->isOK() ) { - wfDebugLog( 'fileupload', 'Download by URL completed successfuly.' ); + wfDebugLog( 'fileupload', 'Download by URL completed successfully.' ); } else { wfDebugLog( 'fileupload', -- To view, visit https://gerrit.wikimedia.org/r/374976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4df0db5b4a0df0191e1eaa305fc49f1959c4a354 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: Use I18n.locale for the attribute
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372860 ) Change subject: Use I18n.locale for the attribute .. Use I18n.locale for the attribute Change-Id: I2ccc570ab4c13ccecfc6fd20f98776d214e1a0ee --- M locales/en.yml M locales/fr.yml A source/layouts/#layout.erb# A source/layouts/.#layout.erb M source/layouts/layout.erb 5 files changed, 93 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport refs/changes/60/372860/1 diff --git a/locales/en.yml b/locales/en.yml index b48a6a4..443f317 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -1,9 +1,6 @@ --- en: - language: -code: "en" - yn: yess: "Yes" noo: "No" diff --git a/locales/fr.yml b/locales/fr.yml index 19a8f0a..23a6e33 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -1,9 +1,6 @@ --- fr: - language: -code: "fr" - yn: yess: "Oui" noo: "Non" diff --git "a/source/layouts/\043layout.erb\043" "b/source/layouts/\043layout.erb\043" new file mode 100644 index 000..05dad05 --- /dev/null +++ "b/source/layouts/\043layout.erb\043" @@ -0,0 +1,91 @@ + + + + + + + https://www.wikimedia.org/static/favicon/wmf.ico;> + <%= current_page.data.title || "Wikimedia Foundation: Transparency Report" %> + + + var _paq = _paq || []; + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="//piwik.wikimedia.org/"; + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', 4]); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); + + + <%= stylesheet_link_tag "bootstrap.min.css" %> + <%= stylesheet_link_tag "master.css" %> + <%= stylesheet_link_tag "graph.css" %> + <%= javascript_include_tag "all" %> + + + + + + + + Toggle navigation + + + + + + + <% if request.path != 'index.html' %> + <%= t('menu.title') %> + <% end %> + + + + + <%= navigation_link( t('menu.privacy'), locale_url('./privacy.html') ) %> + <%= navigation_link( t('menu.content'), locale_url('./content.html') ) %> + <%= navigation_link( t('menu.stories'), locale_url('./stories.html') ) %> + <%= navigation_link( t('menu.faq'), locale_url('./faq.html') ) %> + + + + + <%= yield %> + + + + + <%= t('menu.title') %> + + + + + <%= link_to t('menu.privacy'), locale_url('./privacy.html') %> + <%= link_to t('menu.content'), locale_url('./content.html') %> + <%= link_to t('menu.faq'), locale_url('./faq.html') %> + + + + +
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: UserPager: Call text() on message, don't use it directly
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/368132 ) Change subject: UserPager: Call text() on message, don't use it directly .. UserPager: Call text() on message, don't use it directly Bug: T171806 Change-Id: Ib9a1ae7b65f8a01542c61b192252f3bb3ded1236 --- M includes/specials/pagers/UsersPager.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/368132/1 diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 10baadf..142b128 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -283,7 +283,7 @@ 'value' => $this->requestedUser, ], 'dropdown' => [ - 'label' => $this->msg( 'group' ), + 'label' => $this->msg( 'group' )->text(), 'name' => 'group', 'value' => $this->requestedGroup, 'class' => 'HTMLSelectField', -- To view, visit https://gerrit.wikimedia.org/r/368132 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9a1ae7b65f8a01542c61b192252f3bb3ded1236 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: wip- remove back compat
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367693 ) Change subject: wip- remove back compat .. wip- remove back compat Change-Id: I3917ce012be6456ade43212cdb3568ae4577e4bc --- M src/Element.js 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/93/367693/1 diff --git a/src/Element.js b/src/Element.js index 5f61429..0a4a5af 100644 --- a/src/Element.js +++ b/src/Element.js @@ -179,12 +179,7 @@ parts = data._.split( '.' ); cls = OO.getProp.apply( OO, [ window ].concat( parts ) ); if ( cls === undefined ) { - // The PHP output might be old and not including the "OO.ui" prefix - // TODO: Remove this back-compat after next major release - cls = OO.getProp.apply( OO, [ OO.ui ].concat( parts ) ); - if ( cls === undefined ) { - throw new Error( 'Unknown widget type: id: ' + id + ', class: ' + data._ ); - } + throw new Error( 'Unknown widget type: id: ' + id + ', class: ' + data._ ); } // Verify that we're creating an OO.ui.Element instance -- To view, visit https://gerrit.wikimedia.org/r/367693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3917ce012be6456ade43212cdb3568ae4577e4bc Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: wip php multiline
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367655 ) Change subject: wip php multiline .. wip php multiline Change-Id: I1ff698a3321ecbb9e28ca4c31d424767bc9d6f4e --- M demos/pages/widgets.php A php/widgets/MultilineTextInputWidget.php 2 files changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/55/367655/1 diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php index 34d95b7..b310318 100644 --- a/demos/pages/widgets.php +++ b/demos/pages/widgets.php @@ -456,6 +456,15 @@ ] ), new OOUI\FieldLayout( + new OOUI\MultilineTextInputWidget( [ + 'value' => "Multiline\nMultilineYe" + ] ), + [ + 'label' => "MultilineTextInputWidget \xE2\x80\x8E", + 'align' => 'top' + ] + ), + new OOUI\FieldLayout( new OOUI\TextInputWidget( [ 'multiline' => true, 'value' => "Multiline\nMultiline" diff --git a/php/widgets/MultilineTextInputWidget.php b/php/widgets/MultilineTextInputWidget.php new file mode 100644 index 000..4b31009 --- /dev/null +++ b/php/widgets/MultilineTextInputWidget.php @@ -0,0 +1,49 @@ + false, + 'autofocus' => false, + 'required' => false, + 'multiline' => true, + ], $config ); + + // Parent constructor + parent::__construct( $config ); + + } + + /** +* Check if input supports multiple lines. +* +* @return boolean +*/ + public function isMultiline() { + return true; + } +} -- To view, visit https://gerrit.wikimedia.org/r/367655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ff698a3321ecbb9e28ca4c31d424767bc9d6f4e Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: HTMLForm: Show more options when incorrect displayFromat is set
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367455 ) Change subject: HTMLForm: Show more options when incorrect displayFromat is set .. HTMLForm: Show more options when incorrect displayFromat is set Change-Id: I47a4684f01f5e30629e819403d7445479c4607da --- M includes/htmlform/HTMLForm.php 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/55/367455/1 diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index 61d0d89..d4351e0 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -400,7 +400,13 @@ if ( !in_array( $format, $this->availableDisplayFormats, true ) ) { throw new MWException( 'Display format must be one of ' . - print_r( $this->availableDisplayFormats, true ) ); + print_r( + array_merge( + $this->availableDisplayFormats, + $this->availableSubclassDisplayFormats + ), + true + ) ); } // Evil hack for mobile :( -- To view, visit https://gerrit.wikimedia.org/r/367455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47a4684f01f5e30629e819403d7445479c4607da Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: UserPager: Use multiple checkboxes instead of multiselect
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367122 ) Change subject: UserPager: Use multiple checkboxes instead of multiselect .. UserPager: Use multiple checkboxes instead of multiselect The URL from the serialized form was something like: %5B%5D=editsOnly whereas we needed: =1 Bug: T171332 Change-Id: Iaec223195e121dab83b5605a3dfaffa8e1f93684 --- M includes/specials/pagers/UsersPager.php 1 file changed, 20 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/22/367122/1 diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 7fa03ba..10baadf 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -275,17 +275,6 @@ $groupOptions[ $groupText ] = $group; } - $optionsDefault = []; - if ( $this->editsOnly ) { - $optionsDefault[] = 'editsOnly'; - } - if ( $this->creationSort ) { - $optionsDefault[] = 'creationSort'; - } - if ( $this->mDefaultDirection ) { - $optionsDefault[] = 'desc'; - } - $formDescriptor = [ 'user' => [ 'class' => 'HTMLUserTextField', @@ -300,14 +289,26 @@ 'class' => 'HTMLSelectField', 'options' => $groupOptions, ], - 'options' => [ - 'class' => 'HTMLMultiSelectField', - 'options' => [ - $this->msg( 'listusers-editsonly' )->text() => 'editsOnly', - $this->msg( 'listusers-creationsort' )->text() => 'creationSort', - $this->msg( 'listusers-desc' )->text() => 'desc' - ], - 'default' => $optionsDefault + 'editsOnly' => [ + 'type' => 'check', + 'label' => $this->msg( 'listusers-editsonly' )->text(), + 'name' => 'editsOnly', + 'id' => 'editsOnly', + 'value' => $this->editsOnly + ], + 'creationSort' => [ + 'type' => 'check', + 'label' => $this->msg( 'listusers-creationsort' )->text(), + 'name' => 'creationSort', + 'id' => 'creationSort', + 'value' => $this->creationSort + ], + 'desc' => [ + 'type' => 'check', + 'label' => $this->msg( 'listusers-desc' )->text(), + 'name' => 'desc', + 'id' => 'desc', + 'value' => $this->mDefaultDirection ], 'limithiddenfield' => [ 'class' => 'HTMLHiddenField', -- To view, visit https://gerrit.wikimedia.org/r/367122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaec223195e121dab83b5605a3dfaffa8e1f93684 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:AllPages: Use OOUI
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/366603 ) Change subject: Special:AllPages: Use OOUI .. Special:AllPages: Use OOUI * Don't use vertical-labels * Set a max-width on the fieldLayout-header Bug: T117724 Change-Id: I1e9b45d687492eed290a825de78c6ecc61013da8 --- M includes/specials/SpecialAllPages.php M resources/src/mediawiki.special/mediawiki.special.css 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/03/366603/1 diff --git a/includes/specials/SpecialAllPages.php b/includes/specials/SpecialAllPages.php index 17f6cca..bb18681 100644 --- a/includes/specials/SpecialAllPages.php +++ b/includes/specials/SpecialAllPages.php @@ -112,6 +112,7 @@ 'id' => 'nsfrom', 'size' => 30, 'label-message' => 'allpagesfrom', + 'vertical-label' => false, 'default' => str_replace( '_', ' ', $from ), ], 'to' => [ @@ -120,6 +121,7 @@ 'id' => 'nsto', 'size' => 30, 'label-message' => 'allpagesto', + 'vertical-label' => false, 'default' => str_replace( '_', ' ', $to ), ], 'namespace' => [ @@ -127,6 +129,7 @@ 'name' => 'namespace', 'id' => 'namespace', 'label-message' => 'namespace', + 'vertical-label' => false, 'all' => null, 'value' => $namespace, ], @@ -143,7 +146,7 @@ unset( $fields['hideredirects'] ); } - $form = HTMLForm::factory( 'table', $fields, $this->getContext() ); + $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() ); $form->setMethod( 'get' ) ->setWrapperLegendMsg( 'allpages' ) ->setSubmitTextMsg( 'allpagessubmit' ) diff --git a/resources/src/mediawiki.special/mediawiki.special.css b/resources/src/mediawiki.special/mediawiki.special.css index 36dfee6..5e48984 100644 --- a/resources/src/mediawiki.special/mediawiki.special.css +++ b/resources/src/mediawiki.special/mediawiki.special.css @@ -25,6 +25,11 @@ page-break-inside: avoid; -webkit-column-break-inside: avoid; } + +.mw-special-Allpages .oo-ui-fieldLayout-header { + max-width: 15em; +} + .allpagesredirect { font-style: italic; } -- To view, visit https://gerrit.wikimedia.org/r/366603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e9b45d687492eed290a825de78c6ecc61013da8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: HTMLFormField: Use vertical-label for getLabelAlignOOUI
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/366592 ) Change subject: HTMLFormField: Use vertical-label for getLabelAlignOOUI .. HTMLFormField: Use vertical-label for getLabelAlignOOUI Use the default 'top' unless 'vertical-label' is explicitly set to 'false', in which case it is set to 'left'. Change-Id: I5d8ae261c9c6dc34c7e93c346140d668f8209a6a --- M includes/htmlform/HTMLFormField.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/366592/1 diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 83a8023..86f134d 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -655,6 +655,9 @@ * @return string 'left', 'right', 'top' or 'inline' */ protected function getLabelAlignOOUI() { + if ( $this->mParams['vertical-label'] === false ) { + return 'left'; + } return 'top'; } -- To view, visit https://gerrit.wikimedia.org/r/366592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d8ae261c9c6dc34c7e93c346140d668f8209a6a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: CheckboxMultiselectInputWidget: Pass on `change` event
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365586 ) Change subject: CheckboxMultiselectInputWidget: Pass on `change` event .. CheckboxMultiselectInputWidget: Pass on `change` event Bug: T168735 Change-Id: I6b43ecf14f9c91a3aeac64386dee533e20f6088e --- M src/widgets/CheckboxMultiselectInputWidget.js 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/86/365586/1 diff --git a/src/widgets/CheckboxMultiselectInputWidget.js b/src/widgets/CheckboxMultiselectInputWidget.js index 09801bb..5ff7b4f 100644 --- a/src/widgets/CheckboxMultiselectInputWidget.js +++ b/src/widgets/CheckboxMultiselectInputWidget.js @@ -47,6 +47,12 @@ this.setOptions( config.options || [] ); // Have to repeat this from parent, as we need options to be set up for this to make sense this.setValue( config.value ); + + // Pass the event along. This is a child of InputWidget + // and thus must emit `change`. + this.checkboxMultiselectWidget.on( 'change', function ( e ) { + this.emit( 'change', e ); + }.bind( this ) ); }; /* Setup */ -- To view, visit https://gerrit.wikimedia.org/r/365586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b43ecf14f9c91a3aeac64386dee533e20f6088e Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Replace TextInputWidget (multiline) with MultilineTextInputW...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365550 ) Change subject: Replace TextInputWidget (multiline) with MultilineTextInputWidget .. Replace TextInputWidget (multiline) with MultilineTextInputWidget Bug: T170275 Change-Id: I6010dd314e011c79330464c0e438ccf2f037a9bf --- M modules/ext.templateDataGenerator.ui.tdDialog.js 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData refs/changes/50/365550/1 diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js b/modules/ext.templateDataGenerator.ui.tdDialog.js index 90128ce..cb03a00 100644 --- a/modules/ext.templateDataGenerator.ui.tdDialog.js +++ b/modules/ext.templateDataGenerator.ui.tdDialog.js @@ -133,8 +133,7 @@ } ); - this.descriptionInput = new OO.ui.TextInputWidget( { - multiline: true, + this.descriptionInput = new OO.ui.MultilineTextInputWidget( { autosize: true } ); this.templateDescriptionFieldset = new OO.ui.FieldsetLayout( { @@ -744,7 +743,13 @@ propInput = new OO.ui.CheckboxInputWidget( config ); break; default: - propInput = new OO.ui.TextInputWidget( config ); + if ( config.multiline === true ) { + delete config.multiline; + propInput = new OO.ui.MultilineTextInputWidget( config ); + } else { + delete config.multiline; + propInput = new OO.ui.TextInputWidget( config ); + } break; } -- To view, visit https://gerrit.wikimedia.org/r/365550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6010dd314e011c79330464c0e438ccf2f037a9bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: CreateArticleDialog: Remove unnecessary and deprecated confi...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365547 ) Change subject: CreateArticleDialog: Remove unnecessary and deprecated config from TextInputWidget .. CreateArticleDialog: Remove unnecessary and deprecated config from TextInputWidget See T130434 for details. Also autosize has no meaning if the input isn't multiline. Change-Id: I23a07aa4163ad2b302ca94eba35d0ed31b2a79ca --- M modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder refs/changes/47/365547/1 diff --git a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js index 5b694c7..6a53527 100644 --- a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js +++ b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js @@ -136,9 +136,7 @@ this.titleInput = new OO.ui.TextInputWidget( { value: mw.config.get( 'apLabel' ), label: mw.msg( 'articleplaceholder-abouttopic-create-article-label' ), - multiline: false, - required: true, - autosize: true + required: true } ); this.titleInput.on( 'enter', function () { -- To view, visit https://gerrit.wikimedia.org/r/365547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23a07aa4163ad2b302ca94eba35d0ed31b2a79ca Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticlePlaceholder Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Replace TextInputWidget (multiline) with MultilineTextInputW...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365546 ) Change subject: Replace TextInputWidget (multiline) with MultilineTextInputWidget .. Replace TextInputWidget (multiline) with MultilineTextInputWidget Bug: T170275 Change-Id: Iecb053f614334585274113bcd499976f2eec12db --- M modules/ext.CollaborationKit.list.ui.js 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit refs/changes/46/365546/1 diff --git a/modules/ext.CollaborationKit.list.ui.js b/modules/ext.CollaborationKit.list.ui.js index 27404a2..6630652 100644 --- a/modules/ext.CollaborationKit.list.ui.js +++ b/modules/ext.CollaborationKit.list.ui.js @@ -167,8 +167,7 @@ showImages: true, validateTitle: false // want empty titles allowed. } ); - this.description = new OO.ui.TextInputWidget( { - multiline: true, + this.description = new OO.ui.MultilineTextInputWidget( { label: mw.msg( 'collaborationkit-list-newitem-description' ) } ); -- To view, visit https://gerrit.wikimedia.org/r/365546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecb053f614334585274113bcd499976f2eec12db Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CollaborationKit Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Teahouse[master]: Replace TextInputWidget (multiline) with MultilineTextInputW...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365545 ) Change subject: Replace TextInputWidget (multiline) with MultilineTextInputWidget .. Replace TextInputWidget (multiline) with MultilineTextInputWidget Bug: T170275 Change-Id: If13771db64cb0b1c3511052e78ff53e9b0b65404 --- M resources/ui/dialog/Question.js 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Teahouse refs/changes/45/365545/1 diff --git a/resources/ui/dialog/Question.js b/resources/ui/dialog/Question.js index 03ccfca..bb96bc6 100644 --- a/resources/ui/dialog/Question.js +++ b/resources/ui/dialog/Question.js @@ -57,9 +57,8 @@ } ); - this.tiDesc = new OO.ui.TextInputWidget( { - classes: [ 'teahouse-inputWidget', 'teahouse-tiDesc' ], - multiline: true + this.tiDesc = new OO.ui.MultilineTextInputWidget( { + classes: [ 'teahouse-inputWidget', 'teahouse-tiDesc' ] }); this.tiDesc.on( 'change', this.onTiDescChange, [], this ); @@ -259,4 +258,4 @@ } return $row; -}; \ No newline at end of file +}; -- To view, visit https://gerrit.wikimedia.org/r/365545 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If13771db64cb0b1c3511052e78ff53e9b0b65404 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Teahouse Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Replace TextInputWidget (multiline) with MultilineTextInputW...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364672 ) Change subject: Replace TextInputWidget (multiline) with MultilineTextInputWidget .. Replace TextInputWidget (multiline) with MultilineTextInputWidget Bug: T170275 Change-Id: I88a4dabbd2894a9ddacc55e8fcdedb141480be2b --- M resources/mmv/ui/mmv.ui.reuse.embed.js 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/72/364672/1 diff --git a/resources/mmv/ui/mmv.ui.reuse.embed.js b/resources/mmv/ui/mmv.ui.reuse.embed.js index 9fb3f69..815547c 100644 --- a/resources/mmv/ui/mmv.ui.reuse.embed.js +++ b/resources/mmv/ui/mmv.ui.reuse.embed.js @@ -117,9 +117,8 @@ ( mw.user.isAnon() ? htmlClasses : wikitextClasses ).push( 'active' ); - this.embedTextHtml = new oo.ui.TextInputWidget( { + this.embedTextHtml = new oo.ui.MultilineTextInputWidget( { classes: htmlClasses, - multiline: true, readOnly: true } ); @@ -130,9 +129,8 @@ mw.mmv.actionLogger.log( 'embed-html-copied' ); } ); - this.embedTextWikitext = new oo.ui.TextInputWidget( { + this.embedTextWikitext = new oo.ui.MultilineTextInputWidget( { classes: wikitextClasses, - multiline: true, readOnly: true } ); -- To view, visit https://gerrit.wikimedia.org/r/364672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88a4dabbd2894a9ddacc55e8fcdedb141480be2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Replace TextInputWidget (multiline) with MultilineTextInputW...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364670 ) Change subject: Replace TextInputWidget (multiline) with MultilineTextInputWidget .. Replace TextInputWidget (multiline) with MultilineTextInputWidget Also, remove multiline: false from a couple of places since that is the default value. Bug: T170275 Change-Id: Ic3e993b1b21eea56aec5e5b13b1b51692db31d5e --- M modules/editor/editors/ext.flow.editors.none.js M modules/flow/ui/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.js M modules/flow/ui/widgets/editor/mw.flow.ui.EditorSwitcherWidget.js M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js 5 files changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/70/364670/1 diff --git a/modules/editor/editors/ext.flow.editors.none.js b/modules/editor/editors/ext.flow.editors.none.js index d44c536..80589da 100644 --- a/modules/editor/editors/ext.flow.editors.none.js +++ b/modules/editor/editors/ext.flow.editors.none.js @@ -19,9 +19,8 @@ // node the editor is associated with. this.$node = $node; - this.widget = new OO.ui.TextInputWidget( { + this.widget = new OO.ui.MultilineTextInputWidget( { value: content || '', - multiline: true, autosize: true, maxRows: 999, placeholder: this.$node.attr( 'placeholder' ) diff --git a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.js b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.js index 00e4e48..7195efd 100644 --- a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.js +++ b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.js @@ -18,8 +18,7 @@ mw.flow.ui.WikitextEditorWidget.parent.call( this, config ); // Main textarea - this.input = new OO.ui.TextInputWidget( { - multiline: true, + this.input = new OO.ui.MultilineTextInputWidget( { autosize: true, maxRows: 999, placeholder: config.placeholder, diff --git a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorSwitcherWidget.js b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorSwitcherWidget.js index 2b2317e..5362c06 100644 --- a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorSwitcherWidget.js +++ b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorSwitcherWidget.js @@ -50,8 +50,7 @@ this.switchingPromise = null; this.settingPromise = null; - this.placeholderInput = new OO.ui.TextInputWidget( { - multiline: true, + this.placeholderInput = new OO.ui.MultilineTextInputWidget( { placeholder: this.placeholder, classes: [ 'flow-ui-editorSwitcherWidget-placeholder-input' ] } ); diff --git a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js index caad1d3..652e383 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js @@ -47,7 +47,6 @@ this.title = new OO.ui.TextInputWidget( { placeholder: mw.msg( 'flow-newtopic-start-placeholder' ), - multiline: false, classes: [ 'flow-ui-newTopicWidget-title' ] } ); diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js index 75ed555..c3a5ebc 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js @@ -65,7 +65,6 @@ if ( this.expandable ) { this.triggerInput = new OO.ui.TextInputWidget( { - multiline: false, classes: [ 'flow-ui-replyWidget-trigger-input' ], placeholder: config.placeholder } ); -- To view, visit https://gerrit.wikimedia.org/r/364670 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3e993b1b21eea56aec5e5b13b1b51692db31d5e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FileAnnotations[master]: Replace TextInputWidget (multiline) with MultilineTextInputW...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/364666 ) Change subject: Replace TextInputWidget (multiline) with MultilineTextInputWidget .. Replace TextInputWidget (multiline) with MultilineTextInputWidget Bug: T170275 Change-Id: Ida086f8b49ab3e4748b62282ada4c2e630b05365 --- M resources/src/FileAnnotationEditor.js 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileAnnotations refs/changes/66/364666/1 diff --git a/resources/src/FileAnnotationEditor.js b/resources/src/FileAnnotationEditor.js index d4308ce..3c5004a 100644 --- a/resources/src/FileAnnotationEditor.js +++ b/resources/src/FileAnnotationEditor.js @@ -98,9 +98,7 @@ this.$editor = $( '' ) .addClass( 'annotation-editor' ); - this.textWidget = new OO.ui.TextInputWidget( { - multiline: true - } ); + this.textWidget = new OO.ui.MultilineTextInputWidget(); this.saveButton = new OO.ui.ButtonWidget( { label: mw.message( 'fileannotations-save' ).text(), -- To view, visit https://gerrit.wikimedia.org/r/364666 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida086f8b49ab3e4748b62282ada4c2e630b05365 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FileAnnotations Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: DropdownWidget, MenuSelectWidget: Set aria-expanded attribute
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363120 ) Change subject: DropdownWidget, MenuSelectWidget: Set aria-expanded attribute .. DropdownWidget, MenuSelectWidget: Set aria-expanded attribute Bug: T149653 Change-Id: I79ec8918c0e6d22483e3d15c1b0d55bfe01c45a1 --- M src/widgets/DropdownWidget.js M src/widgets/MenuSelectWidget.js 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/20/363120/1 diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js index 3f6c477..22f8745 100644 --- a/src/widgets/DropdownWidget.js +++ b/src/widgets/DropdownWidget.js @@ -158,6 +158,10 @@ */ OO.ui.DropdownWidget.prototype.onMenuToggle = function ( isVisible ) { this.$element.toggleClass( 'oo-ui-dropdownWidget-open', isVisible ); + this.$handle.attr( + 'aria-expanded', + this.$element.hasClass( 'oo-ui-dropdownWidget-open' ).toString() + ); }; /** diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js index 1ea6e32..d566b9e 100644 --- a/src/widgets/MenuSelectWidget.js +++ b/src/widgets/MenuSelectWidget.js @@ -350,6 +350,8 @@ this.togglePositioning( !!this.$floatableContainer ); this.toggleClipping( true ); + this.$focusOwner.attr( 'aria-expanded', 'true' ); + if ( this.getSelectedItem() ) { this.$focusOwner.attr( 'aria-activedescendant', this.getSelectedItem().getElementId() ); this.getSelectedItem().scrollElementIntoView( { duration: 0 } ); @@ -365,6 +367,7 @@ this.$focusOwner.removeAttr( 'aria-activedescendant' ); this.unbindKeyDownListener(); this.unbindKeyPressListener(); + this.$focusOwner.attr( 'aria-expanded', 'false' ); this.getElementDocument().removeEventListener( 'mousedown', this.onDocumentMouseDownHandler, true ); this.togglePositioning( false ); this.toggleClipping( false ); -- To view, visit https://gerrit.wikimedia.org/r/363120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79ec8918c0e6d22483e3d15c1b0d55bfe01c45a1 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: WindowManager: Set aria-hidden by default and change toggleA...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363038 ) Change subject: WindowManager: Set aria-hidden by default and change toggleAriaIsolation behavior .. WindowManager: Set aria-hidden by default and change toggleAriaIsolation behavior * demo: Add a link to open an alert from the ProcessDialog * Set aria-hidden to true by default on a new WindowManager * Set aria-hidden to true everywhere, instead of just adding the attribute. Not setting it explicitly might cause issues according to the note on: https://www.w3.org/TR/wai-aria-1.1/#aria-hidden Also see: https://www.w3.org/TR/wai-aria-1.1/#valuetype_true-false-undefined * Return the element itself if there is no other top level element * Explicitly un-hide the WindowManager $element when isolate === true * Explicit hide the WindowManager $eleme when isolate === false I could make multiple patches out of this if it makes review easier. Bug: T98561 Change-Id: I7c1f42dd163a7850fb33912d6a41c7d56b9083b0 --- M demos/classes/ProcessDialog.js M src/WindowManager.js 2 files changed, 27 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/38/363038/1 diff --git a/demos/classes/ProcessDialog.js b/demos/classes/ProcessDialog.js index c0f3d6c..6ddc898 100644 --- a/demos/classes/ProcessDialog.js +++ b/demos/classes/ProcessDialog.js @@ -9,9 +9,20 @@ { action: 'other', label: 'Other', flags: 'other' } ]; Demo.ProcessDialog.prototype.initialize = function () { + var $content; Demo.ProcessDialog.parent.prototype.initialize.apply( this, arguments ); + + $content = $( '' ).append( + $( '' ).text( 'Dialog content' ), + $( '' ) + .text( 'Be alert!' ) + .on( 'click', function () { + OO.ui.alert( 'You are alert!' ); + } ) + ); + this.content = new OO.ui.PanelLayout( { padded: true, expanded: false } ); - this.content.$element.append( 'Dialog content' ); + this.content.$element.append( $content ); this.$body.append( this.content.$element ); }; Demo.ProcessDialog.prototype.getActionProcess = function ( action ) { diff --git a/src/WindowManager.js b/src/WindowManager.js index 1945318..5df5a04 100644 --- a/src/WindowManager.js +++ b/src/WindowManager.js @@ -82,6 +82,7 @@ // Initialization this.$element .addClass( 'oo-ui-windowManager' ) + .attr( 'aria-hidden', true ) .toggleClass( 'oo-ui-windowManager-modal', this.modal ); }; @@ -748,20 +749,32 @@ * @chainable */ OO.ui.WindowManager.prototype.toggleAriaIsolation = function ( isolate ) { + var $topLevelElement; isolate = isolate === undefined ? !this.$ariaHidden : !!isolate; if ( isolate ) { if ( !this.$ariaHidden ) { + // Find the top level element containing the window manager or the + // window manager's element itself in case its a direct child of body + $topLevelElement = this.$element.parentsUntil( 'body' ).last(); + $topLevelElement = $topLevelElement.length === 0 ? this.$element : $topLevelElement; + + // In case previously set by another window manager + this.$element.removeAttr( 'aria-hidden' ); + // Hide everything other than the window manager from screen readers this.$ariaHidden = $( 'body' ) .children() - .not( this.$element.parentsUntil( 'body' ).last() ) - .attr( 'aria-hidden', '' ); + .not( $topLevelElement ) + .attr( 'aria-hidden', true ); } } else if ( this.$ariaHidden ) { // Restore screen reader visibility this.$ariaHidden.removeAttr( 'aria-hidden' ); this.$ariaHidden = null; + + // and hide the window manager + this.$element.attr( 'aria-hidden', true ); } return this; -- To view, visit https://gerrit.wikimedia.org/r/363038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c1f42dd163a7850fb33912d6a41c7d56b9083b0 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [wip] Special:ListUsers: Use HTMLForm and OOUI
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362872 ) Change subject: [wip] Special:ListUsers: Use HTMLForm and OOUI .. [wip] Special:ListUsers: Use HTMLForm and OOUI There are a bunch of issues that I am unable to tackle, see the TODO comments in the patch. Bug: T111999 Change-Id: I109065100e40fef0c56a010c444de04a40950479 --- M includes/specials/pagers/UsersPager.php 1 file changed, 73 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/72/362872/1 diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 9aef9ad..28f7af2 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -325,15 +325,85 @@ ); $out .= ''; - Hooks::run( 'SpecialListusersHeaderForm', [ $this, &$out ] ); - # Submit button and form bottom $out .= Html::hidden( 'limit', $this->mLimit ); $out .= Xml::submitButton( $this->msg( 'listusers-submit' )->text() ); - Hooks::run( 'SpecialListusersHeader', [ $this, &$out ] ); + $out .= Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); + // TODO: Try HTMLForm + $groupOptions = [ $this->msg( 'group-all' )->text() => '' ]; + foreach ( $this->getAllGroups() as $group => $groupText ) { + $groupOptions[ $groupText ] = $group; + } + + $optionsDefault = []; + if ( $this->editsOnly ) { + $optionsDefault[] = 'editsOnly'; + } + if ( $this->creationSort ) { + $optionsDefault[] = 'creationSort'; + } + if ( $this->mDefaultDirection ) { + $optionsDefault[] = 'desc'; + } + + + $formDescriptor = [ + 'titlehiddenfield' => [ + 'class' => 'HTMLHiddenField', + 'name' => 'title', + 'value' => $self, + ], + 'user' => [ + 'class' => 'HTMLUserTextField', + 'label' => $this->msg( 'listusersfrom' )->text(), + 'name' => 'username', + 'value' => $this->requestedUser, + ], + 'dropdown' => [ + 'label' => $this->msg( 'group' ), + 'name' => 'group', + 'value' => $thi->requestedGroup, + 'class' => 'HTMLSelectField', + 'options' => $groupOptions, + ], + 'options' => [ + 'class' => 'HTMLMultiSelectField', + 'options' => [ + $this->msg( 'listusers-editsonly' )->text() => 'editsOnly', + $this->msg( 'listusers-creationsort' )->text() => 'creationSort', + $this->msg( 'listusers-desc' )->text() => 'desc' + ], + 'default' => $optionsDefault + ], + 'limithiddenfield' => [ + 'class' => 'HTMLHiddenField', + 'name' => 'limit', + 'value' => $this->mLimit + ] + ]; + + $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() ); + $htmlForm + ->setMethod( 'get' ) + // TODO: The form is not being submitted correctly, goes to index.php + ->setAction( wfScript() ) + ->setId( 'mw-listusers-form' ) + // TODO: Setting the identifier breaks infusion for user and group + // ->setFormIdentifier( 'mw-listusers-form' ) + ->setSubmitText( $this->msg( 'listusers-submit' )->text() ) + ->setWrapperLegendMsg( 'listusers' ); + + // TODO: $out =, instead of $out .= + // No need to append when you're done testing + $out .= $htmlForm->prepareForm()->getHTML( true ); + + // TODO: Run the hooks at the right time, is it possible? + Hooks::run( 'SpecialListusersHeaderForm', [ $this, &$out ] ); + Hooks::run( 'SpecialListusersHeader', [ $this, &$out ] ); + return $out; }
[MediaWiki-commits] [Gerrit] oojs/ui[master]: FieldLayout: Add role='alert' for error messages
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362158 ) Change subject: FieldLayout: Add role='alert' for error messages .. FieldLayout: Add role='alert' for error messages Follows the ARIA pattern as described in: https://www.w3.org/TR/WCAG20-TECHS/ARIA19.html Also adding a demo where error notices are added and removed based on validation. Bug: T97957 Change-Id: Ib900e8d760a8e4d132d668eb3043ef85778dd29d --- M demos/pages/widgets.js M src/layouts/FieldLayout.js 2 files changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/58/362158/1 diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js index d4ccc95..e9cee0b 100644 --- a/demos/pages/widgets.js +++ b/demos/pages/widgets.js @@ -3,6 +3,7 @@ loremIpsum = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, ' + 'sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\u200E', textInputForLabel, labelForTextInput, radioSelectInputForLabel, labelForRadioSelectInput, + inputForValidation, fieldLayoutForValidation, horizontalDragItems = [], verticalDragItems = [], verticalHandledDragItems = [], @@ -56,6 +57,28 @@ labelForRadioSelectInput = new OO.ui.LabelWidget( { label: 'Label for RadioSelectInputWidget below', input: radioSelectInputForLabel + } ); + + inputForValidation = new OO.ui.TextInputWidget( { + validate: function ( value ) { + return value.length % 2 === 0; + } + } ); + + fieldLayoutForValidation = new OO.ui.FieldLayout( inputForValidation, { + align: 'top', + label: 'FieldLayout aligned top with validation errors', + help: 'Enter only even number of characters' + } ); + + inputForValidation.$input.on( 'blur', function () { + inputForValidation.getValidity().then( function () { + fieldLayoutForValidation.setErrors( [] ); + }, function () { + fieldLayoutForValidation.setErrors( [ + 'Please enter an even number of characters' + ] ); + } ); } ); fieldsets = [ @@ -2515,7 +2538,8 @@ errors: [ 'The value must be a number.' ], align: 'top' } - ) + ), + fieldLayoutForValidation ] } ), new OO.ui.FieldsetLayout( { diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js index 2bbe48a..00a2fb9 100644 --- a/src/layouts/FieldLayout.js +++ b/src/layouts/FieldLayout.js @@ -170,6 +170,7 @@ $listItem = $( '' ); if ( kind === 'error' ) { $icon = new OO.ui.IconWidget( { icon: 'alert', flags: [ 'warning' ] } ).$element; + $listItem.attr( 'role', 'alert' ); } else if ( kind === 'notice' ) { $icon = new OO.ui.IconWidget( { icon: 'info' } ).$element; } else { -- To view, visit https://gerrit.wikimedia.org/r/362158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib900e8d760a8e4d132d668eb3043ef85778dd29d Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: FieldLayout: Set 'aria-describedby' on the fieldWidget
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362147 ) Change subject: FieldLayout: Set 'aria-describedby' on the fieldWidget .. FieldLayout: Set 'aria-describedby' on the fieldWidget Follows the ARIA pattern as described in: https://www.w3.org/TR/WCAG20-TECHS/ARIA1.html Bug: T97957 Change-Id: I8fd845700aabdcc46878e381d9f4610f1d4651c1 --- M src/layouts/FieldLayout.js M src/widgets/PopupWidget.js 2 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/47/362147/1 diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js index 2bbe48a..778558f 100644 --- a/src/layouts/FieldLayout.js +++ b/src/layouts/FieldLayout.js @@ -97,8 +97,21 @@ this.fieldWidget.connect( this, { disable: 'onFieldDisable' } ); // Initialization + if ( config.help ) { + // Set the 'aria-describedby' attribute on the fieldWidget + // Preference given to an input or a button + ( + this.fieldWidget.$input || + this.fieldWidget.$button || + this.fieldWidget.$element + ).attr( + 'aria-describedby', + this.popupButtonWidget.getPopup().getBodyId() + ); + } if ( this.fieldWidget.getInputId() ) { this.$label.attr( 'for', this.fieldWidget.getInputId() ); + } else { this.$label.on( 'click', function () { this.fieldWidget.simulateLabelClick(); diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js index c9f2658..a35a1ec 100644 --- a/src/widgets/PopupWidget.js +++ b/src/widgets/PopupWidget.js @@ -576,3 +576,18 @@ OO.ui.PopupWidget.prototype.getPosition = function () { return this.popupPosition; }; + +/** + * Get an ID of the body element, this can be used as the + * `aria-describedby` attribute for an input field. + * + * @return {string} The ID of the body element + */ +OO.ui.PopupWidget.prototype.getBodyId = function () { + var id = this.$body.attr( 'id' ); + if ( id === undefined ) { + id = OO.ui.generateElementId(); + this.$body.attr( 'id', id ); + } + return id; +}; -- To view, visit https://gerrit.wikimedia.org/r/362147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fd845700aabdcc46878e381d9f4610f1d4651c1 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: docs: Use oojs-ui-wikimediaui, instead of -mediawiki
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/361393 ) Change subject: docs: Use oojs-ui-wikimediaui, instead of -mediawiki .. docs: Use oojs-ui-wikimediaui, instead of -mediawiki Change-Id: Iac6a526c928fe384f5f7df5af6b0156146bf2f33 --- M maintenance/jsduck/eg-iframe.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/93/361393/1 diff --git a/maintenance/jsduck/eg-iframe.html b/maintenance/jsduck/eg-iframe.html index e7fdd7d..91e0bc1 100644 --- a/maintenance/jsduck/eg-iframe.html +++ b/maintenance/jsduck/eg-iframe.html @@ -50,7 +50,7 @@ - +
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [wip] ooui implementation for htmlselectandother
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357198 ) Change subject: [wip] ooui implementation for htmlselectandother .. [wip] ooui implementation for htmlselectandother see T106999 Change-Id: I0f437ed8a8808f8090bf466fd939345d74d57c34 --- M includes/htmlform/fields/HTMLSelectAndOtherField.php M includes/specials/SpecialBlankpage.php 2 files changed, 74 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/98/357198/1 diff --git a/includes/htmlform/fields/HTMLSelectAndOtherField.php b/includes/htmlform/fields/HTMLSelectAndOtherField.php index 9af60e5..c395de4 100644 --- a/includes/htmlform/fields/HTMLSelectAndOtherField.php +++ b/includes/htmlform/fields/HTMLSelectAndOtherField.php @@ -64,7 +64,63 @@ } public function getInputOOUI( $value ) { - return false; + # Textbox (from getInputHTML) + $textAttribs = [ + 'id' => $this->mID . '-other', + 'size' => $this->getSize(), + 'class' => [ 'mw-htmlform-select-and-other-field' ], + 'data-id-select' => $this->mID, + ]; + + if ( $this->mClass !== '' ) { + $textAttribs['class'][] = $this->mClass; + } + + $allowedParams = [ + 'required', + 'autofocus', + 'multiple', + 'disabled', + 'tabindex', + 'maxlength', // gets dynamic with javascript, see mediawiki.htmlform.js + ]; + + $textAttribs = OOUI\Element::configFromHtmlAttributes( + $this->getAttributes( $allowedParams ) + ); + + # DropdownInput (from HTMLSelectField::getInputOOUI (which is this class's parent)) + $disabled = false; + $allowedParams = [ 'tabindex' ]; + $dropdownInputAttribs = OOUI\Element::configFromHtmlAttributes( + $this->getAttributes( $allowedParams ) + ); + + if ( $this->mClass !== '' ) { + $dropdownInputAttribs['classes'] = [ $this->mClass ]; + } + + if ( !empty( $this->mParams['disabled'] ) ) { + $disabled = true; + } + + $dropdownInputAttribs += [ + 'name' => $this->mName, + 'id' => $this->mID, + 'options' => $this->getOptionsOOUI(), + 'value' => strval( $value ), + 'disabled' => $disabled, + ]; + + return $this->getInputWidget( [ + "textinput" => $textAttribs, + "dropdowninput" => $dropdownInputAttribs, + "or" => false, + ] ); + } + + public function getInputWidget( $params ) { + return new Mediawiki\Widget\SelectWithInputWidget( $params ); } /** diff --git a/includes/specials/SpecialBlankpage.php b/includes/specials/SpecialBlankpage.php index e61f12b..7bd3e7c 100644 --- a/includes/specials/SpecialBlankpage.php +++ b/includes/specials/SpecialBlankpage.php @@ -34,6 +34,22 @@ public function execute( $par ) { $this->setHeaders(); - $this->getOutput()->addWikiMsg( 'intentionallyblankpage' ); + $out = $this->getOutput(); + + $form = array(); + $form['selectandother'] = array( + 'type' => 'selectandother', + 'label' => 'selectandother', + 'options' => array( # The options available within the menu (displayed => value) + 'Option 0' => 0, + 'Option 1' => 1, + 'Option 2' => 'option2id' + ), + 'size' => 18, # Display size of 'other' field + 'maxlength'=> 10 # Input size of 'other' field + ); + + $htmlForm = HTMLForm::factory( 'ooui', $form, $this->getContext() ); + $out->addHTML( $htmlForm->prepareForm()->getHTML( false ) ); } } -- To view, visit https://gerrit.wikimedia.org/r/357198 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f437ed8a8808f8090bf466fd939345d74d57c34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] integration/config[master]: Drop Blueprint from Zuul, archived
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356433 ) Change subject: Drop Blueprint from Zuul, archived .. Drop Blueprint from Zuul, archived Bug: T166055 Change-Id: I29a425959b82511d0dfcc074db0838699f284008 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/33/356433/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 386ea00..f1883e5 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1649,12 +1649,6 @@ - name: mwgate-npm - name: skin-tests - - name: mediawiki/skins/Blueprint -template: - - name: mwgate-composer - - name: mwgate-npm - - name: skin-tests - - name: mediawiki/skins/BlueSky template: - name: mwgate-composer -- To view, visit https://gerrit.wikimedia.org/r/356433 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29a425959b82511d0dfcc074db0838699f284008 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Add links to documentation from code examples
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356398 ) Change subject: demos: Add links to documentation from code examples .. demos: Add links to documentation from code examples Change-Id: Idaa7cc48bcf0a255706749af3d6b0cbde1cd2bea --- M demos/demo.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/98/356398/1 diff --git a/demos/demo.js b/demos/demo.js index 3c8dc00..1b1b34e 100644 --- a/demos/demo.js +++ b/demos/demo.js @@ -592,6 +592,9 @@ 'https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/demos/classes/' + item.constructor.name.slice( 4 ) + '.js'; out = '// See source code:\n// ' + url + '\n' + out; + } else { + url = 'https://doc.wikimedia.org/oojs-ui/master/js/#!/api/' + constructorName; + out = '// See documentation at: \n// ' + url + '\n' + out; } return out; -- To view, visit https://gerrit.wikimedia.org/r/356398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idaa7cc48bcf0a255706749af3d6b0cbde1cd2bea Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [do not merge] Use WikimediaUI variables in the Mediawiki theme
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354205 ) Change subject: [do not merge] Use WikimediaUI variables in the Mediawiki theme .. [do not merge] Use WikimediaUI variables in the Mediawiki theme For T165652. This is not real. At least not until T165652. To test: cd node_modules git clone https://phabricator.wikimedia.org/source/wikimedia-ui-base.git cd wikimedia-ui-base # npm complains if there is a git repo in node_modules rm -rf .git See T165652 for the meaning of MISSING, REF etc. Change-Id: I323260f70872f3e2c36d92281c953f42f462add5 --- M src/themes/mediawiki/common.less 1 file changed, 61 insertions(+), 58 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/354205/1 diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less index 695f63f..2f24a8b 100644 --- a/src/themes/mediawiki/common.less +++ b/src/themes/mediawiki/common.less @@ -1,57 +1,60 @@ +@import '../../../node_modules/wikimedia-ui-base/wikimedia-ui-base.less'; + // Theme variables @oo-ui-default-image-path: 'themes/mediawiki/images'; -@oo-ui-font-size-browser: 16; // assumed browser default of `16px` -@oo-ui-font-size-default: 0.8em; // equals `12.8px` at browser default of `16px` +@oo-ui-font-size-browser: 16; // assumed browser default of `16px` MISSING +@oo-ui-font-size-default: 0.8em; // equals `12.8px` at browser default of `16px` MISSING -@background-color-default: #fff; -@background-color-default-hover: #eaecf0; -@background-color-readonly: #f8f9fa; +@background-color-default: @wmui-color-base100; +@background-color-default-hover: @wmui-color-base80; +@background-color-readonly: @wmui-color-base90; -@color-default: #222; -@color-default-hover: #444; -@color-default-active: #000; -@color-default-light: #fff; +@color-default: @wmui-color-base10; +@color-default-hover: @color-base--hover; +@color-default-active: @color-base--active; +@color-default-light: @color-base--inverted; // SEEME, are light and inverted the same? @color-emphasized: @color-default-active; -@color-placeholder: #72777d; // equals HSB 210°/9%/49%, aligns to WCAG 2.0 level AA at 4.52:1 contrast ratio -@color-subtle: #72777d; +// Removed @color-placeholder SAME +@color-subtle: @color-base--subtle; // Primary 'Progressive' and 'Destructive' Colors -@background-color-progressive: #eaf3ff; // equals rgba output in `fade( @color-progressive, 10% )` -@background-color-progressive-hover: rgba( 41, 98, 204, 0.1 ); -@color-progressive: #36c; // equals HSB 220°/75%/80% -@color-progressive-hover: #447ff5; // equals HSB 220°/72%/96% -@color-progressive-active: #2a4b8d; // equals HSB 220°/70%/55% +// Should this have been the value of @background-color-primary in WMUI? MISTAKE +@background-color-progressive: @wmui-color-accent90; +@background-color-progressive-hover: @background-color-primary--hover; +@color-progressive: @color-primary; +@color-progressive-hover: @color-primary--hover; +@color-progressive-active: @color-primary--active; @color-progressive-active-hover: @color-progressive; @color-progressive-focus: @color-progressive; -@background-color-destructive: #fbe8e7; // equals `fade( @color-destructive, 10% )` -@color-destructive: #d33; // equals HSB 360°/77%/87% -@color-destructive-non-primary: #d7; // Exemption for non-primary buttons, foremost used in VE, lightened up R50 to align to AA contrast ratio -@color-destructive-hover: #ff4242; // equals HSB 360°/74%/100% -@color-destructive-active: #b32424; // equals HSB 360°/80%/70% -@color-destructive-focus: @color-destructive; +// Removed @background-color-destructive, even though the value is slightly different SAME VALUE +// @color-destructive: #d33; // equals HSB 360°/77%/87% SAME +@color-destructive-non-primary: #d7; // Exemption for non-primary buttons, foremost used in VE, lightened up R50 to align to AA contrast ratio MISSING +@color-destructive-hover: @color-destructive--hover; +@color-destructive-active: @color-destructive--active; +@color-destructive-focus: @color-destructive; // @color-primary--focus in wmui should not be accent50 again MISTAKE REF // Disabled Widgets -@background-color-disabled: #eaecf0; -@background-color-disabled-filled: #c8ccd1; -@color-disabled: #72777d; +@background-color-disabled: @wmui-color-base80; +@background-color-disabled-filled: @wmui-color-base70; +@color-disabled: @color-base--disabled; @color-disabled-filled: @color-default-light; -@opacity-disabled: 0.51; // `0.51` equals `#7d7d7d` on background-color `#fff`, HSB 0°/0%/49% -@opacity-disabled-filled: 1; -@opacity-disabled-indicator: 0.15; // equals `#c7c8cc` on background-color `#fff` -@opacity-disabled-tool: 0.3; +@opacity-disabled: @opacity-base--disabled; +@opacity-disabled-filled: @opacity-base; +@opacity-disabled-indicator: 0.15; // equals `#c7c8cc` on background-color `#fff` MISSING
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Use TabPanelLayout instead of the deprecated CardLayout
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354099 ) Change subject: Use TabPanelLayout instead of the deprecated CardLayout .. Use TabPanelLayout instead of the deprecated CardLayout Bug: T164902 Change-Id: I979cb14b8430bf89ae9a453786bc4337ef82211d --- M modules/ve-math/ve.ui.MWLatexDialog.js 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/99/354099/1 diff --git a/modules/ve-math/ve.ui.MWLatexDialog.js b/modules/ve-math/ve.ui.MWLatexDialog.js index 2d8c8c2..38806ca 100644 --- a/modules/ve-math/ve.ui.MWLatexDialog.js +++ b/modules/ve-math/ve.ui.MWLatexDialog.js @@ -55,34 +55,34 @@ */ ve.ui.MWLatexDialog.prototype.initialize = function () { var formulaPanel, inputField, displayField, idField, category, - formulaCard, optionsCard, + formulaTabPanel, optionsTabPanel, dialog = this; // Parent method ve.ui.MWLatexDialog.super.prototype.initialize.call( this ); - // Layout for the formula inserter (formula card) and options form (options card) + // Layout for the formula inserter (formula tab panel) and options form (options tab panel) this.indexLayout = new OO.ui.IndexLayout( { scrollable: false, expanded: true } ); - formulaCard = new OO.ui.CardLayout( 'formula', { + formulaTabPanel = new OO.ui.TabPanelLayout( 'formula', { label: ve.msg( 'math-visualeditor-mwlatexdialog-card-formula' ), expandable: false, scrollable: false, padded: true } ); - optionsCard = new OO.ui.CardLayout( 'options', { + optionsTabPanel = new OO.ui.TabPanelLayout( 'options', { label: ve.msg( 'math-visualeditor-mwlatexdialog-card-options' ), expandable: false, scrollable: false, padded: true } ); - this.indexLayout.addCards( [ - formulaCard, - optionsCard + this.indexLayout.addTabPanels( [ + formulaTabPanel, + optionsTabPanel ] ); // Layout for symbol picker (menu) and input and preview (content) @@ -180,10 +180,10 @@ ) ); - formulaCard.$element.append( + formulaTabPanel.$element.append( dialog.menuLayout.$element ); - optionsCard.$element.append( + optionsTabPanel.$element.append( displayField.$element, idField.$element ); -- To view, visit https://gerrit.wikimedia.org/r/354099 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I979cb14b8430bf89ae9a453786bc4337ef82211d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Citoid[master]: Use TabPanelLayout instead of deprecated CardLayout
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354096 ) Change subject: Use TabPanelLayout instead of deprecated CardLayout .. Use TabPanelLayout instead of deprecated CardLayout Bug: T164904 Change-Id: I6b2309fe44dd447215cd2f621e7b8634a8545151 --- M modules/ve.ui.CiteFromIdInspector.js 1 file changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid refs/changes/96/354096/1 diff --git a/modules/ve.ui.CiteFromIdInspector.js b/modules/ve.ui.CiteFromIdInspector.js index f425ab8..78c8bf1 100644 --- a/modules/ve.ui.CiteFromIdInspector.js +++ b/modules/ve.ui.CiteFromIdInspector.js @@ -142,21 +142,21 @@ } ); this.modePanels = { - auto: new OO.ui.CardLayout( 'auto', { + auto: new OO.ui.TabPanelLayout( 'auto', { label: ve.msg( 'citoid-citefromiddialog-mode-auto' ), classes: [ 'citoid-citeFromIDDialog-panel-auto' ], padded: true, expanded: false, scrollable: false } ), - manual: new OO.ui.CardLayout( 'manual', { + manual: new OO.ui.TabPanelLayout( 'manual', { label: ve.msg( 'citoid-citefromiddialog-mode-manual' ), classes: [ 'citoid-citeFromIDDialog-panel-manual' ], padded: true, expanded: false, scrollable: false } ), - reuse: new OO.ui.CardLayout( 'reuse', { + reuse: new OO.ui.TabPanelLayout( 'reuse', { label: ve.msg( 'citoid-citefromiddialog-mode-reuse' ), classes: [ 'citoid-citeFromIDDialog-panel-reuse' ], expanded: false, @@ -164,7 +164,7 @@ } ) }; - this.modeIndex.addCards( [ + this.modeIndex.addTabPanels( [ this.modePanels.auto, this.modePanels.manual, this.modePanels.reuse @@ -263,34 +263,34 @@ /** * Handle set events from mode index layout * - * @param {OO.ui.CardLayout} card Set card + * @param {OO.ui.TabPanelLayout} tabPanel Set tab panel */ -ve.ui.CiteFromIdInspector.prototype.onModeIndexSet = function ( card ) { - this.setModePanel( card.getName(), null, true ); +ve.ui.CiteFromIdInspector.prototype.onModeIndexSet = function ( tabPanel ) { + this.setModePanel( tabPanel.getName(), null, true ); }; /** * Switch to a specific mode panel * - * @param {string} cardName Panel name, 'auto', 'manual' or 'reuse' + * @param {string} tabPanelName Panel name, 'auto', 'manual' or 'reuse' * @param {string} [processPanelName] Process panel name, 'lookup' or 'result' * @param {boolean} [fromSelect] Mode was changed by the select widget */ -ve.ui.CiteFromIdInspector.prototype.setModePanel = function ( cardName, processPanelName, fromSelect ) { +ve.ui.CiteFromIdInspector.prototype.setModePanel = function ( tabPanelName, processPanelName, fromSelect ) { var inspector = this; - if ( [ 'auto', 'manual', 'reuse' ].indexOf( cardName ) === -1 ) { - cardName = 'auto'; - } else if ( cardName === 'reuse' && this.modeIndex.getCard( 'reuse' ).tabItem.isDisabled() ) { - cardName = 'auto'; - } else if ( cardName !== ( ve.userConfig( 'citoid-mode' ) || 'auto' ) ) { - ve.userConfig( 'citoid-mode', cardName ); + if ( [ 'auto', 'manual', 'reuse' ].indexOf( tabPanelName ) === -1 ) { + tabPanelName = 'auto'; + } else if ( tabPanelName === 'reuse' && this.modeIndex.getTabPanel( 'reuse' ).tabItem.isDisabled() ) { + tabPanelName = 'auto'; + } else if ( tabPanelName !== ( ve.userConfig( 'citoid-mode' ) || 'auto' ) ) { + ve.userConfig( 'citoid-mode', tabPanelName ); } if ( !fromSelect ) { - this.modeIndex.setCard( cardName ); + this.modeIndex.setTabPanel( tabPanelName ); } - switch ( cardName ) { + switch ( tabPanelName ) { case 'auto': processPanelName = processPanelName || this.currentAutoProcessPanel || 'lookup'; this.autoProcessStack.setItem( this.autoProcessPanels[ processPanelName ] ); @@ -309,10 +309,10 @@ this.search.getQuery().focus(); break; } - // Result card goes 'fullscreen' by hiding the tab widget + // Result tab panel goes 'fullscreen' by hiding the tab widget // TODO: Do this in a less hacky way this.modeIndex.toggleMenu( !( processPanelName && processPanelName === 'result' ) ); - this.actions.setMode( cardName + ( processPanelName ? '-' + processPanelName
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Rename deprecated CardLayout to TabPanelLayaout
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354087 ) Change subject: Rename deprecated CardLayout to TabPanelLayaout .. Rename deprecated CardLayout to TabPanelLayaout Bug: T164901 Change-Id: Iee302bf2f5557ed163a0e50d5fd1d9bd41de6d2a --- M modules/ve-score/ve.ui.MWScoreInspector.js 1 file changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/87/354087/1 diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js b/modules/ve-score/ve.ui.MWScoreInspector.js index 9fb7546..4719f58 100644 --- a/modules/ve-score/ve.ui.MWScoreInspector.js +++ b/modules/ve-score/ve.ui.MWScoreInspector.js @@ -43,7 +43,7 @@ midiField, overrideMidiField, vorbisField, overrideOggField, rawField, - notationCard, audioCard, midiCard, advancedCard; + notationTabPanel, audioTabPanel, midiTabPanel, advancedTabPanel; // Parent method ve.ui.MWScoreInspector.super.prototype.initialize.call( this ); @@ -54,37 +54,37 @@ expanded: false } ); - // Cards - notationCard = new OO.ui.CardLayout( 'notation', { + // TabPanels + notationTabPanel = new OO.ui.TabPanelLayout( 'notation', { label: ve.msg( 'score-visualeditor-mwscoreinspector-card-notation' ), expanded: false, scrollable: false, padded: true } ); - audioCard = new OO.ui.CardLayout( 'audio', { + audioTabPanel = new OO.ui.TabPanelLayout( 'audio', { label: ve.msg( 'score-visualeditor-mwscoreinspector-card-audio' ), expanded: false, scrollable: false, padded: true } ); - midiCard = new OO.ui.CardLayout( 'midi', { + midiTabPanel = new OO.ui.TabPanelLayout( 'midi', { label: ve.msg( 'score-visualeditor-mwscoreinspector-card-midi' ), expanded: false, scrollable: false, padded: true } ); - advancedCard = new OO.ui.CardLayout( 'advanced', { + advancedTabPanel = new OO.ui.TabPanelLayout( 'advanced', { label: ve.msg( 'score-visualeditor-mwscoreinspector-card-advanced' ), expanded: false, scrollable: false, padded: true } ); - this.indexLayout.addCards( [ - notationCard, - audioCard, - midiCard, - advancedCard + this.indexLayout.addTabPanels( [ + notationTabPanel, + audioTabPanel, + midiTabPanel, + advancedTabPanel ] ); // Language @@ -147,20 +147,20 @@ // Initialization this.$content.addClass( 've-ui-mwScoreInspector-content' ); - notationCard.$element.append( + notationTabPanel.$element.append( inputField.$element, langField.$element, this.generatedContentsError.$element ); - audioCard.$element.append( + audioTabPanel.$element.append( vorbisField.$element, overrideOggField.$element ); - midiCard.$element.append( + midiTabPanel.$element.append( midiField.$element, overrideMidiField.$element ); - advancedCard.$element.append( + advancedTabPanel.$element.append( rawField.$element ); this.form.$element.append( @@ -208,7 +208,7 @@ this.overrideMidiInput.on( 'change', this.onChangeHandler ); this.overrideOggInput.on( 'change', this.onChangeHandler ); - this.indexLayout.connect( this, { set: 'onCardSet' } ); + this.indexLayout.connect( this, { set: 'onTabPanelSet' } ); this.indexLayout.connect( this, { set: 'updateSize' } ); this.langSelect.connect( this, { choose: 'toggleDisableRawCheckbox' } ); this.midiCheckbox.connect( this, { change: 'toggleDisableOverrideMidiInput' } ); @@ -301,10 +301,10 @@ }; /** - * Append the error to the current card. + * Append the error to the current tab panel. */ -ve.ui.MWScoreInspector.prototype.onCardSet = function () { - this.indexLayout.getCurrentCard().$element.append( this.generatedContentsError.$element ); +ve.ui.MWScoreInspector.prototype.onTabPanelSet = function () { + this.indexLayout.getCurrentTabPanel().$element.append( this.generatedContentsError.$element ); }; /* Registration */ -- To view, visit https://gerrit.wikimedia.org/r/354087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: