jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330334 )
Change subject: Update OOjs UI to v0.18.3 ...................................................................... Update OOjs UI to v0.18.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3 Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/LICENSE-MIT M oojs/oojs-ui/demos/demo.js M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/i18n/be.json A oojs/oojs-ui/i18n/hif-latn.json M oojs/oojs-ui/i18n/tr.json M oojs/oojs-ui/i18n/tt-cyrl.json M oojs/oojs-ui/package.json 14 files changed, 210 insertions(+), 83 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 6b4d69a..82a2a0d 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.18.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.18.2", + "oojs/oojs-ui": "0.18.3", "oyejorge/less.php": "1.7.0.10", "pear/console_getopt": "1.4.1", "pear/mail": "1.3.0", diff --git a/composer.lock b/composer.lock index b878558..70f75df 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, "This file is @generated automatically" ], - "hash": "397be71e6ee5f14bae4e3ffcd8912b6a", - "content-hash": "847ea388961ccf4a15f5d546d302bc97", + "hash": "f25cafdd248952593b4b86d219fea2b4", + "content-hash": "ba8d9669db068ed289f92e66405adae1", "packages": [ { "name": "composer/semver", @@ -466,16 +466,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.18.2", + "version": "v0.18.3", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9" + "reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9";, - "reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/82a7a321a17b8a910d6056d64d1f324450d93ee7";, + "reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7", "shasum": "" }, "require": { @@ -541,7 +541,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2016-12-06 23:05:36" + "time": "2017-01-03 22:46:48" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 205f360..1aa29c5 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2007,17 +2007,17 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.18.2", - "version_normalized": "0.18.2.0", + "version": "v0.18.3", + "version_normalized": "0.18.3.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9" + "reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9";, - "reference": "f33b9cf3de7b9ef0aa66a27c93643ccdcc05d0a9", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/82a7a321a17b8a910d6056d64d1f324450d93ee7";, + "reference": "82a7a321a17b8a910d6056d64d1f324450d93ee7", "shasum": "" }, "require": { @@ -2029,7 +2029,7 @@ "mediawiki/mediawiki-codesniffer": "0.6.0", "phpunit/phpunit": "4.8.21" }, - "time": "2016-12-06 23:05:36", + "time": "2017-01-03 22:46:48", "type": "library", "installation-source": "dist", "autoload": { diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md index bd9dbe5..075da13 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,4 +1,45 @@ # OOjs UI Release History +## v0.18.3 / 2017-01-03 +### Deprecations +* [DEPRECATING CHANGE] icons: Deprecate the 'beta' and 'ribbonPrize' icons (James D. Forrester) +* [DEPRECATING CHANGE] icons: Rename '*Undo' to 'un*' (James D. Forrester) +* [DEPRECATING CHANGE] icons: Rename 'betaLaunch' to 'logoWikimediaDiscovery', move pack (James D. Forrester) + +### Features +* ComboBoxInputWidget: Make it impossible to set `multiline` to true (Prateek Saxena) +* Introduce `OO.ui.isMobile()` (Ed Sanders) +* Provide `OO.ui.prompt()` method to complement `confirm()`/`alert()` (Ed Sanders) + +### Styles +* FloatableElement: Replace superfluous class with general one (Volker E) +* MediaWiki theme: Change custom error border color to `destructive` (Volker E) +* MediaWiki theme: Change error/invalid color to alias of `destructive` (Volker E) +* MediaWiki theme: Fix PHP CheckboxMultiselectInputWidget/RadioSelectInputWidget option spacing (Bartosz Dziewoński) +* MediaWiki theme: Indicate normal, flagged ButtonWidgets' `:hover` clearer (Volker E) +* MediaWiki theme: Set `line-height` explicitly on legends and labels (Volker E) + +### Code +* BarToolGroup: Remove obsolete CSS selectors (Volker E) +* ClippableElement: Compatibility with jQuery 3 (Bartosz Dziewoński) +* Element: Do not try to scroll invisible/unattached elements into view (Bartosz Dziewoński) +* LabelWidget: Properly hide labels if they are set to null (Ed Sanders) +* NumberInputWidget: Avoid bitwise tricks when checking for integers (Bartosz Dziewoński) +* PopupButtonWidget: Remove unnecessary CSS property (Volker E) +* ProgressBarWidget: Use CSS transforms for indeterminate widget (Bartosz Dziewoński) +* TextInputWidget: Do nothing in `#adjustSize`/`#positionLabel` if not attached (Bartosz Dziewoński) +* TextInputWidget: Only call `#onElementAttach` on focus if it wasn't called (Bartosz Dziewoński) +* TextInputWidget: Use `Element#isElementAttached` (Bartosz Dziewoński) +* styles: Replace `transform` with dedicated mixin (Volker E) +* MediaWiki theme: Make `box-shadow` LESS vars follow naming scheme (Volker E) +* MediaWiki theme: Simplify frameless ButtonWidget selectors (Volker E) +* performance: Apply webkit GPU hack to scrollable panels (Ed Sanders) +* demos: Add disabled Progress bar (Volker E) +* demos: Add examples for `OO.ui.alert()`/`confirm()`/`prompt()` (Bartosz Dziewoński) +* demos: Avoid using 'required' as a test indicator (Ed Sanders) +* build: Bump file copyright notices for 2017 (James D. Forrester) +* docs: Fix small typo (Amir Sarabadani) + + ## v0.18.2 / 2016-12-06 ### Styles * MediaWiki theme: Address sub-pixel rendering issues of RadioInputWidgets (Volker E) diff --git a/oojs/oojs-ui/LICENSE-MIT b/oojs/oojs-ui/LICENSE-MIT index 4c2c253..25303af 100644 --- a/oojs/oojs-ui/LICENSE-MIT +++ b/oojs/oojs-ui/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright 2011-2016 OOjs UI Team and other contributors. +Copyright 2011-2017 OOjs UI Team and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/oojs/oojs-ui/demos/demo.js b/oojs/oojs-ui/demos/demo.js index 7a39a9d..49620e2 100644 --- a/oojs/oojs-ui/demos/demo.js +++ b/oojs/oojs-ui/demos/demo.js @@ -6,7 +6,9 @@ * @constructor */ OO.ui.Demo = function OoUiDemo() { - // Parent + var demo = this; + + // Parent constructor OO.ui.Demo.parent.call( this ); // Normalization @@ -46,23 +48,30 @@ '&direction=' + this.mode.direction } ) ] ); + this.platformSelect = new OO.ui.ButtonSelectWidget().addItems( [ + new OO.ui.ButtonOptionWidget( { data: 'desktop', label: 'Desktop' } ), + new OO.ui.ButtonOptionWidget( { data: 'mobile', label: 'Mobile' } ) + ] ); // Events this.pageMenu.on( 'choose', OO.ui.bind( this.onModeChange, this ) ); this.themeSelect.on( 'choose', OO.ui.bind( this.onModeChange, this ) ); this.directionSelect.on( 'choose', OO.ui.bind( this.onModeChange, this ) ); + this.platformSelect.on( 'choose', OO.ui.bind( this.onModeChange, this ) ); // Initialization this.pageMenu.selectItemByData( this.mode.page ); this.themeSelect.selectItemByData( this.mode.theme ); this.directionSelect.selectItemByData( this.mode.direction ); + this.platformSelect.selectItemByData( this.mode.platform ); this.$menu .addClass( 'oo-ui-demo-menu' ) .append( this.pageDropdown.$element, this.themeSelect.$element, this.directionSelect.$element, - this.jsPhpSelect.$element + this.jsPhpSelect.$element, + this.platformSelect.$element ); this.$element .addClass( 'oo-ui-demo' ) @@ -71,6 +80,9 @@ $( 'head' ).append( this.stylesheetLinks ); // eslint-disable-next-line new-cap OO.ui.theme = new ( this.constructor.static.themes[ this.mode.theme ].theme )(); + OO.ui.isMobile = function () { + return demo.mode.platform === 'mobile'; + }; }; /* Setup */ @@ -154,6 +166,14 @@ }; /** + * Available platforms. + * + * @static + * @property {string[]} + */ +OO.ui.Demo.static.platforms = [ 'desktop', 'mobile' ]; + +/** * Default page. * * Set by one of the page scripts in the `pages` directory. @@ -182,6 +202,16 @@ * @property {string} */ OO.ui.Demo.static.defaultDirection = 'ltr'; + +/** + * Default platform. + * + * Set by one of the page scripts in the `pages` directory. + * + * @static + * @property {string} + */ +OO.ui.Demo.static.defaultPlatform = 'desktop'; /* Methods */ @@ -221,9 +251,10 @@ OO.ui.Demo.prototype.onModeChange = function () { var page = this.pageMenu.getSelectedItem().getData(), theme = this.themeSelect.getSelectedItem().getData(), - direction = this.directionSelect.getSelectedItem().getData(); + direction = this.directionSelect.getSelectedItem().getData(), + platform = this.platformSelect.getSelectedItem().getData(); - location.hash = '#' + [ page, theme, direction ].join( '-' ); + location.hash = '#' + [ page, theme, direction, platform ].join( '-' ); }; /** @@ -232,14 +263,14 @@ * Factors are a mapping between symbolic names used in the URL hash and internal information used * to act on those symbolic names. * - * Factor lists are in URL order: page, theme, direction. Page contains the symbolic + * Factor lists are in URL order: page, theme, direction, platform. Page contains the symbolic * page name, others contain file suffixes. * * @return {Object[]} List of mode factors, keyed by symbolic name */ OO.ui.Demo.prototype.getFactors = function () { var key, - factors = [ {}, {}, {} ]; + factors = [ {}, {}, {}, {} ]; for ( key in this.constructor.static.pages ) { factors[ 0 ][ key ] = key; @@ -250,6 +281,9 @@ for ( key in this.constructor.static.directions ) { factors[ 2 ][ key ] = this.constructor.static.directions[ key ].fileSuffix; } + this.constructor.static.platforms.forEach( function ( platform ) { + factors[ 3 ][ platform ] = ''; + } ); return factors; }; @@ -257,7 +291,7 @@ /** * Get a list of default factors. * - * Factor defaults are in URL order: page, theme, direction. Each contains a symbolic + * Factor defaults are in URL order: page, theme, direction, platform. Each contains a symbolic * factor name which should be used as a fallback when the URL hash is missing or invalid. * * @return {Object[]} List of default factors @@ -266,7 +300,8 @@ return [ this.constructor.static.defaultPage, this.constructor.static.defaultTheme, - this.constructor.static.defaultDirection + this.constructor.static.defaultDirection, + this.constructor.static.defaultPlatform ]; }; @@ -292,7 +327,8 @@ return { page: factorValues[ 0 ], theme: factorValues[ 1 ], - direction: factorValues[ 2 ] + direction: factorValues[ 2 ], + platform: factorValues[ 3 ] }; }; diff --git a/oojs/oojs-ui/demos/pages/dialogs.js b/oojs/oojs-ui/demos/pages/dialogs.js index d175795..bed75f9 100644 --- a/oojs/oojs-ui/demos/pages/dialogs.js +++ b/oojs/oojs-ui/demos/pages/dialogs.js @@ -1,5 +1,5 @@ OO.ui.Demo.static.pages.dialogs = function ( demo ) { - var i, l, name, openButton, DialogClass, config, + var i, l, name, openButton, DialogClass, config, configQuick, $demo = demo.$element, fieldset = new OO.ui.FieldsetLayout( { label: 'Dialogs' } ), windows = {}, @@ -73,7 +73,7 @@ ProcessDialog.static.title = 'Process dialog'; ProcessDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' }, + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] }, { action: 'other', label: 'Other', flags: 'other' } ]; ProcessDialog.prototype.initialize = function () { @@ -102,7 +102,7 @@ LongProcessDialog.static.title = 'Process dialog'; LongProcessDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' }, + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] }, { action: 'other', label: 'Other', flags: 'other' } ]; LongProcessDialog.prototype.initialize = function () { @@ -128,15 +128,6 @@ return this.content.$element.outerHeight( true ); }; - function FramelessProcessDialog( config ) { - FramelessProcessDialog.parent.call( this, config ); - } - OO.inheritClass( FramelessProcessDialog, ProcessDialog ); - FramelessProcessDialog.static.actions = OO.copy( FramelessProcessDialog.static.actions ); - FramelessProcessDialog.static.actions.forEach( function ( action ) { - action.framed = false; - } ); - function SearchWidgetDialog( config ) { SearchWidgetDialog.parent.call( this, config ); this.broken = false; @@ -159,7 +150,7 @@ return 300; }; SearchWidgetDialog.static.actions = [ - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; SearchWidgetDialog.prototype.getActionProcess = function ( action ) { var dialog = this; @@ -177,7 +168,7 @@ BrokenDialog.static.actions = [ { action: 'save', label: 'Save', flags: [ 'primary', 'constructive' ] }, { action: 'delete', label: 'Delete', flags: 'destructive' }, - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; BrokenDialog.prototype.getBodyHeight = function () { return 250; @@ -254,7 +245,7 @@ BookletDialog.static.title = 'Booklet dialog'; BookletDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; BookletDialog.prototype.getBodyHeight = function () { return 250; @@ -325,7 +316,7 @@ OutlinedBookletDialog.static.title = 'Outlined booklet dialog'; OutlinedBookletDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; OutlinedBookletDialog.prototype.getBodyHeight = function () { return 250; @@ -372,7 +363,7 @@ ContinuousOutlinedBookletDialog.static.title = 'Continuous outlined booklet dialog'; ContinuousOutlinedBookletDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; ContinuousOutlinedBookletDialog.prototype.getBodyHeight = function () { return 250; @@ -437,7 +428,7 @@ IndexedDialog.static.title = 'Indexed dialog'; IndexedDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; IndexedDialog.prototype.getBodyHeight = function () { return 250; @@ -473,7 +464,7 @@ MenuDialog.static.title = 'Menu dialog'; MenuDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; MenuDialog.prototype.getBodyHeight = function () { return 350; @@ -569,7 +560,7 @@ DialogWithDropdowns.static.title = 'Dialog with dropdowns ($overlay test)'; DialogWithDropdowns.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, - { action: 'cancel', label: 'Cancel', flags: 'safe' } + { action: 'cancel', label: 'Cancel', flags: [ 'safe', 'back' ] } ]; DialogWithDropdowns.prototype.getBodyHeight = function () { return 300; @@ -684,6 +675,36 @@ return DialogWithDropdowns.parent.prototype.getActionProcess.call( this, action ); }; + configQuick = [ + { + name: 'Quick alert', + method: 'alert', + param: 'Alert message.' + }, + { + name: 'Quick confirm', + method: 'confirm', + param: 'Confirmation message?' + }, + { + name: 'Quick prompt', + method: 'prompt', + param: 'Text prompt:' + } + ]; + + for ( i = 0, l = configQuick.length; i < l; i++ ) { + openButton = new OO.ui.ButtonWidget( { + framed: false, + icon: 'window', + label: $( '<span dir="ltr"></span>' ).text( configQuick[ i ].name ) + } ); + openButton.on( + 'click', OO.ui.bind( OO.ui, configQuick[ i ].method, configQuick[ i ].param ) + ); + fieldset.addItems( [ new OO.ui.FieldLayout( openButton, { align: 'inline' } ) ] ); + } + config = [ { name: 'Simple dialog (small)', @@ -756,13 +777,6 @@ { name: 'Process dialog (medium, long)', dialogClass: LongProcessDialog, - config: { - size: 'medium' - } - }, - { - name: 'Process dialog (frameless buttons)', - dialogClass: FramelessProcessDialog, config: { size: 'medium' } @@ -872,7 +886,7 @@ { action: 'reject', label: 'Cancel', - flags: 'safe' + flags: [ 'safe', 'back' ] }, { action: 'repeat', @@ -889,7 +903,7 @@ title: 'Delete file?', message: 'The file will be irreversably obliterated. Proceed with caution.', actions: [ - { action: 'reject', label: 'Cancel', flags: 'safe' }, + { action: 'reject', label: 'Cancel', flags: [ 'safe', 'back' ] }, { action: 'reject', label: 'Move file to trash' }, { action: 'accept', diff --git a/oojs/oojs-ui/demos/pages/icons.js b/oojs/oojs-ui/demos/pages/icons.js index 4c9bdc1..1072571 100644 --- a/oojs/oojs-ui/demos/pages/icons.js +++ b/oojs/oojs-ui/demos/pages/icons.js @@ -64,8 +64,6 @@ 'tray' ], interactions: [ - 'beta', - 'betaLaunch', 'bookmark', 'browser', 'clear', @@ -77,22 +75,21 @@ 'logOut', 'newWindow', 'printer', - 'ribbonPrize', 'sun', 'watchlist' ], moderation: [ 'block', - 'blockUndo', + 'unBlock', 'flag', - 'flagUndo', + 'unFlag', 'lock', - 'ongoingConversation', + 'unLock', 'star', - 'trash', - 'trashUndo', 'unStar', - 'unLock' + 'trash', + 'unTrash', + 'ongoingConversation' ], 'editing-core': [ 'edit', @@ -194,6 +191,7 @@ wikimedia: [ 'logoCC', 'logoWikimediaCommons', + 'logoWikimediaDiscovery', 'logoWikipedia' ] }, diff --git a/oojs/oojs-ui/demos/pages/widgets.js b/oojs/oojs-ui/demos/pages/widgets.js index 70e15ea..0e5fa6b 100644 --- a/oojs/oojs-ui/demos/pages/widgets.js +++ b/oojs/oojs-ui/demos/pages/widgets.js @@ -559,7 +559,7 @@ label: 'Two' } ), new OO.ui.ButtonWidget( { - indicator: 'required', + indicator: 'alert', label: 'Three' } ) ] @@ -601,7 +601,7 @@ } ), new OO.ui.ButtonOptionWidget( { data: 'd', - indicator: 'required', + indicator: 'alert', label: 'Three' } ) ] @@ -626,7 +626,7 @@ } ), new OO.ui.ButtonOptionWidget( { data: 'd', - indicator: 'required', + indicator: 'alert', label: 'Three' } ) ] @@ -651,7 +651,7 @@ } ), new OO.ui.ButtonOptionWidget( { data: 'd', - indicator: 'required', + indicator: 'alert', label: 'Three' } ) ] @@ -1040,7 +1040,7 @@ multiline: true, autosize: true, icon: 'tag', - indicator: 'required', + indicator: 'alert', label: 'Inline label', value: 'Autosize\nAutosize\nAutosize\nAutosize' } ), @@ -1057,7 +1057,7 @@ label: 'Inline label' } ), { - label: 'TextInputWidget (label)\u200E', + label: 'TextInputWidget (icon, indicator, label)\u200E', align: 'top' } ), @@ -1065,7 +1065,7 @@ new OO.ui.TextInputWidget( { value: 'Disabled', icon: 'tag', - indicator: 'required', + indicator: 'alert', label: 'Inline label', disabled: true } ), @@ -1101,7 +1101,7 @@ new OO.ui.FieldLayout( new OO.ui.SelectFileWidget( { icon: 'tag', - indicator: 'required' + indicator: 'alert' } ), { label: 'SelectFileWidget (icon, indicator)\u200E', @@ -1111,7 +1111,7 @@ new OO.ui.FieldLayout( new OO.ui.SelectFileWidget( { icon: 'tag', - indicator: 'required', + indicator: 'alert', disabled: true } ), { @@ -1164,7 +1164,7 @@ new OO.ui.MenuOptionWidget( { data: 'b', label: 'Second', - indicator: 'required' + indicator: 'alert' } ), new OO.ui.MenuOptionWidget( { data: 'c', @@ -1199,7 +1199,7 @@ new OO.ui.MenuOptionWidget( { data: 'b', label: 'Disabled second option', - indicator: 'required', + indicator: 'alert', disabled: true } ), new OO.ui.MenuOptionWidget( { @@ -1409,7 +1409,7 @@ new OO.ui.CapsuleMultiselectWidget( { allowArbitrary: true, icon: 'tag', - indicator: 'required', + indicator: 'alert', menu: { items: [ new OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ), @@ -1430,7 +1430,7 @@ new OO.ui.CapsuleMultiselectWidget( { disabled: true, icon: 'tag', - indicator: 'required', + indicator: 'alert', menu: { items: [ new OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ), @@ -1706,7 +1706,7 @@ ), new OO.ui.FieldLayout( new OO.ui.IndicatorWidget( { - indicator: 'required', + indicator: 'alert', title: 'Required indicator' } ), { @@ -1716,7 +1716,7 @@ ), new OO.ui.FieldLayout( new OO.ui.IndicatorWidget( { - indicator: 'required', + indicator: 'alert', title: 'Required indicator', disabled: true } ), @@ -1876,6 +1876,15 @@ } ), { label: 'Progress bar', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ProgressBarWidget( { + disabled: true + } ), + { + label: 'Progress bar (disabled)\u200E', align: 'top' } ), @@ -2057,7 +2066,7 @@ label: 'Two' } ), new OO.ui.ButtonOptionWidget( { - indicator: 'required', + indicator: 'alert', label: 'Three' } ) ] diff --git a/oojs/oojs-ui/i18n/be.json b/oojs/oojs-ui/i18n/be.json index 7db7547..7b4e546 100644 --- a/oojs/oojs-ui/i18n/be.json +++ b/oojs/oojs-ui/i18n/be.json @@ -3,7 +3,8 @@ "authors": [ "Чаховіч Уладзіслаў", "Artificial123", - "Goshaproject" + "Goshaproject", + "Mechanizatar" ] }, "ooui-outline-control-move-down": "Перамясціць элемент ўніз", @@ -18,6 +19,7 @@ "ooui-dialog-process-dismiss": "Прапусціць", "ooui-dialog-process-retry": "Паспрабаваць яшчэ раз", "ooui-dialog-process-continue": "Працягнуць", + "ooui-selectfile-button-select": "Выбраць файл", "ooui-selectfile-not-supported": "Выбраны файл не падтрымліваецца", "ooui-selectfile-placeholder": "Файл не выбраны" } diff --git a/oojs/oojs-ui/i18n/hif-latn.json b/oojs/oojs-ui/i18n/hif-latn.json new file mode 100644 index 0000000..9e903ca --- /dev/null +++ b/oojs/oojs-ui/i18n/hif-latn.json @@ -0,0 +1,23 @@ +{ + "@metadata": { + "authors": [ + "Thakurji" + ] + }, + "ooui-outline-control-move-down": "Item ke niche karo", + "ooui-outline-control-move-up": "Item ke uppar karo", + "ooui-outline-control-remove": "Item ke hatao", + "ooui-toolbar-more": "Aur", + "ooui-toolgroup-expand": "Aur", + "ooui-toolgroup-collapse": "Kamtii", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Cancel karo", + "ooui-dialog-process-error": "Koi chij wrong hoe gais", + "ooui-dialog-process-dismiss": "Dismiss karo", + "ooui-dialog-process-retry": "Fir se try karo", + "ooui-dialog-process-continue": "Continue", + "ooui-selectfile-button-select": "Ek file ke select karo", + "ooui-selectfile-not-supported": "File selection ke support nai karaa jaawe hai", + "ooui-selectfile-placeholder": "Koi file ke nai select karaa gais hai", + "ooui-selectfile-dragdrop-placeholder": "Hian pe file ke girao" +} diff --git a/oojs/oojs-ui/i18n/tr.json b/oojs/oojs-ui/i18n/tr.json index dbe9f86..9b88695 100644 --- a/oojs/oojs-ui/i18n/tr.json +++ b/oojs/oojs-ui/i18n/tr.json @@ -11,7 +11,8 @@ "Sayginer", "Meelo", "McAang", - "Uğurkent" + "Uğurkent", + "1917 Ekim Devrimi" ] }, "ooui-outline-control-move-down": "Ögeyi aşağı taşı", @@ -28,5 +29,6 @@ "ooui-dialog-process-continue": "Devam et", "ooui-selectfile-button-select": "Dosya seç", "ooui-selectfile-not-supported": "Dosya seçimi desteklenmiyor", - "ooui-selectfile-placeholder": "Herhangi bir dosya seçilmedi" + "ooui-selectfile-placeholder": "Herhangi bir dosya seçilmedi", + "ooui-selectfile-dragdrop-placeholder": "Dosyayı buraya aç" } diff --git a/oojs/oojs-ui/i18n/tt-cyrl.json b/oojs/oojs-ui/i18n/tt-cyrl.json index 911b618..335e509 100644 --- a/oojs/oojs-ui/i18n/tt-cyrl.json +++ b/oojs/oojs-ui/i18n/tt-cyrl.json @@ -18,5 +18,7 @@ "ooui-dialog-process-retry": "Кабатлау", "ooui-dialog-process-continue": "Дәвам итү", "ooui-selectfile-button-select": "Файлны сайлагыз", - "ooui-selectfile-placeholder": "Файл сайланмаган" + "ooui-selectfile-not-supported": "Файл сайлау хупланмый", + "ooui-selectfile-placeholder": "Файл сайланмаган", + "ooui-selectfile-dragdrop-placeholder": "Файлны монда куегыз" } diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index 0a67425..088317b 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.18.2", + "version": "0.18.3", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/330334 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Catrope <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
