Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/290602
Change subject: Update OOjs UI to v0.17.3 ...................................................................... Update OOjs UI to v0.17.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.3 Change-Id: I3fe38754c18a83554593479ea1b01f8a60144435 --- M composer.json M composer.lock M composer/installed.json A oojs/oojs-ui/.stylelintrc M oojs/oojs-ui/History.md M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/eu.json A oojs/oojs-ui/i18n/gom-latn.json A oojs/oojs-ui/i18n/gor.json M oojs/oojs-ui/i18n/hr.json M oojs/oojs-ui/i18n/lv.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/widgets/TextInputWidget.php 15 files changed, 237 insertions(+), 94 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/02/290602/1 diff --git a/composer.json b/composer.json index 7701503..6242cd4 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.18.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.17.2", + "oojs/oojs-ui": "0.17.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 8a4267a..0cfab87 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": "dc852b7f2bb5efd73adc116edd209c4a", - "content-hash": "6afed3a26c04be671b9e9cd7ab0b00db", + "hash": "b4e1317390ac96c9e2e5174390879f50", + "content-hash": "fd539bcbde44e20ed005eecf15c4e691", "packages": [ { "name": "composer/semver", @@ -430,16 +430,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.17.2", + "version": "v0.17.3", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "236cd4cf1b3df288ee524b1c90716832ebb9af07" + "reference": "48ba46ffbb0300abd4418ac9581a9eb81fa72a00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/236cd4cf1b3df288ee524b1c90716832ebb9af07";, - "reference": "236cd4cf1b3df288ee524b1c90716832ebb9af07", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/48ba46ffbb0300abd4418ac9581a9eb81fa72a00";, + "reference": "48ba46ffbb0300abd4418ac9581a9eb81fa72a00", "shasum": "" }, "require": { @@ -505,7 +505,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2016-05-10 22:32:23" + "time": "2016-05-24 22:04:46" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 1afbdd4..8628f6e 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1802,17 +1802,17 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.17.2", - "version_normalized": "0.17.2.0", + "version": "v0.17.3", + "version_normalized": "0.17.3.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "236cd4cf1b3df288ee524b1c90716832ebb9af07" + "reference": "48ba46ffbb0300abd4418ac9581a9eb81fa72a00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/236cd4cf1b3df288ee524b1c90716832ebb9af07";, - "reference": "236cd4cf1b3df288ee524b1c90716832ebb9af07", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/48ba46ffbb0300abd4418ac9581a9eb81fa72a00";, + "reference": "48ba46ffbb0300abd4418ac9581a9eb81fa72a00", "shasum": "" }, "require": { @@ -1824,7 +1824,7 @@ "mediawiki/mediawiki-codesniffer": "0.6.0", "phpunit/phpunit": "4.8.21" }, - "time": "2016-05-10 22:32:23", + "time": "2016-05-24 22:04:46", "type": "library", "installation-source": "dist", "autoload": { diff --git a/oojs/oojs-ui/.stylelintrc b/oojs/oojs-ui/.stylelintrc new file mode 100644 index 0000000..5595bb6 --- /dev/null +++ b/oojs/oojs-ui/.stylelintrc @@ -0,0 +1,14 @@ +{ + "extends": "stylelint-config-wikimedia", + "rules": { + "at-rule-empty-line-before": null, + "block-closing-brace-space-after": null, + "block-no-empty": null, + "block-no-single-line": null, + "declaration-no-important": null, + "font-family-name-quotes": [ "double-where-recommended" ], + "no-descending-specificity": null, + "string-no-newline": true, + "string-quotes": null + } +} diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md index 3617b36..80dced4 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,5 +1,39 @@ # OOjs UI Release History +## v0.17.3 / 2016-05-24 +### Deprecations +* [DEPRECATING CHANGE] CapsuleMultiSelectWidget: Rename to CapsuleMultiselectWidget (Bartosz Dziewoński) + +### Features +* SelectWidget/OptionWidget: Implement selecting by accesskey (Bartosz Dziewoński) +* TextInputWidget: Stop returning 'multiline' from 'getSaneType' (Prateek Saxena) + +### Styles +* SelectFileWidget: Improve consistency to other widgets (Volker E) +* MediaWiki theme: Align styles of normal and not-supported SelectFileWidgets (Volker E) + +### Code +* CapsuleMultiselectWidget: Prefer Array#map to jQuery.map (Bartosz Dziewoński) +* CapsuleMultiselectWidget: Use OO.ui.findFocusable() (Bartosz Dziewoński) +* dependencies: Update es5-shim to v4.5.8 (James D. Forrester) +* build: Bump grunt-stylelint to v0.3.0 (James D. Forrester) +* build: Bump various devDependencies to latest (James D. Forrester) +* build: Fix watch path for css (Ed Sanders) +* build: Remove grunt-cli (Ed Sanders) +* build: Upgrade stylelint-config-wikimedia to 0.2.0 and make pass (James D. Forrester) +* build: Use stylelint instead of csslint (Volker E) +* docs: Add some missing @mixins documentation (Bartosz Dziewoński) +* stylelint: Add `@` whitespace and name case rules (Volker E) +* stylelint: Add `@media` whitespace rules (Volker E) +* stylelint: Add block formatting rules (Volker E) +* stylelint: Add font rules (Volker E) +* stylelint: Add no duplicate property rule (Volker E) +* stylelint: Add selector whitespace (Volker E) +* stylelint: Add whitespace rules (Volker E) +* stylelint: Change to use central Wikimedia configuration (Volker E) +* stylelint: Use null instead of false to disable rules (Ed Sanders) + + ## v0.17.2 / 2016-05-10 ### Features * ButtonWidget: Implement, document and demonstrate the 'active' config option (Bartosz Dziewoński) diff --git a/oojs/oojs-ui/demos/pages/dialogs.js b/oojs/oojs-ui/demos/pages/dialogs.js index 720deb6..8085dd3 100644 --- a/oojs/oojs-ui/demos/pages/dialogs.js +++ b/oojs/oojs-ui/demos/pages/dialogs.js @@ -642,8 +642,8 @@ } ), $spacer.clone() ] } ), new SamplePage( 'capsule', { - label: 'CapsuleMultiSelectWidget', - content: [ $spacer.clone(), new OO.ui.CapsuleMultiSelectWidget( { + label: 'CapsuleMultiselectWidget', + content: [ $spacer.clone(), new OO.ui.CapsuleMultiselectWidget( { $overlay: this.$overlay, menu: { items: this.makeItems() @@ -651,9 +651,9 @@ } ), $spacer.clone() ] } ), new SamplePage( 'capsule2', { - label: 'CapsuleMultiSelectWidget', + label: 'CapsuleMultiselectWidget', icon: 'alert', - content: [ $spacer.clone(), new OO.ui.CapsuleMultiSelectWidget( { + content: [ $spacer.clone(), new OO.ui.CapsuleMultiselectWidget( { menu: { items: this.makeItems() } diff --git a/oojs/oojs-ui/demos/pages/widgets.js b/oojs/oojs-ui/demos/pages/widgets.js index 7513db0..29a33d5 100644 --- a/oojs/oojs-ui/demos/pages/widgets.js +++ b/oojs/oojs-ui/demos/pages/widgets.js @@ -176,7 +176,7 @@ } } ); capsulePopupWidget.$element.css( 'vertical-align', 'middle' ); - capsuleWithPopup = new OO.ui.CapsuleMultiSelectWidget( { + capsuleWithPopup = new OO.ui.CapsuleMultiselectWidget( { allowArbitrary: true, popup: { $content: capsulePopupWidget.$element } } ); @@ -536,16 +536,6 @@ } ), { label: 'ButtonWidget (frameless, indicator)\u200E', - align: 'top' - } - ), - new OO.ui.FieldLayout( - new OO.ui.ButtonWidget( { - label: 'AccessKeyed', - accessKey: 'k' - } ), - { - label: 'ButtonWidget (with accesskey k)\u200E', align: 'top' } ) @@ -996,16 +986,6 @@ } ), new OO.ui.FieldLayout( - new OO.ui.TextInputWidget( { - value: 'Accesskey A', - accessKey: 'a' - } ), - { - label: 'TextInputWidget (with Accesskey)\u200E', - align: 'top' - } - ), - new OO.ui.FieldLayout( new OO.ui.SelectFileWidget( {} ), { label: 'SelectFileWidget\u200E', @@ -1290,7 +1270,7 @@ } ), new OO.ui.FieldLayout( - new OO.ui.CapsuleMultiSelectWidget( { + new OO.ui.CapsuleMultiselectWidget( { menu: { items: [ new OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ), @@ -1303,12 +1283,12 @@ } } ), { - label: 'CapsuleMultiSelectWidget', + label: 'CapsuleMultiselectWidget', align: 'top' } ), new OO.ui.FieldLayout( - new OO.ui.CapsuleMultiSelectWidget( { + new OO.ui.CapsuleMultiselectWidget( { allowArbitrary: true, icon: 'tag', indicator: 'required', @@ -1324,12 +1304,12 @@ } } ), { - label: 'CapsuleMultiSelectWidget (icon, indicator, arbitrary values allowed)', + label: 'CapsuleMultiselectWidget (icon, indicator, arbitrary values allowed)', align: 'top' } ), new OO.ui.FieldLayout( - new OO.ui.CapsuleMultiSelectWidget( { + new OO.ui.CapsuleMultiselectWidget( { disabled: true, icon: 'tag', indicator: 'required', @@ -1345,12 +1325,12 @@ } } ), { - label: 'CapsuleMultiSelectWidget (disabled)\u200E', + label: 'CapsuleMultiselectWidget (disabled)\u200E', align: 'top' } ), new OO.ui.FieldLayout( - new OO.ui.CapsuleMultiSelectWidget( { + new OO.ui.CapsuleMultiselectWidget( { disabled: true, menu: { items: [ @@ -1361,12 +1341,12 @@ } } ).addItemsFromData( [ 'abc', 'asd' ] ), { - label: 'CapsuleMultiSelectWidget (disabled, initially selected)\u200E', + label: 'CapsuleMultiselectWidget (disabled, initially selected)\u200E', align: 'top' } ), new OO.ui.FieldLayout( - new OO.ui.CapsuleMultiSelectWidget( { + new OO.ui.CapsuleMultiselectWidget( { menu: { items: [ new OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ), @@ -1376,14 +1356,14 @@ } } ).addItemsFromData( [ 'abc', 'asd' ] ), { - label: 'CapsuleMultiSelectWidget (initially selected)\u200E', + label: 'CapsuleMultiselectWidget (initially selected)\u200E', align: 'top' } ), new OO.ui.FieldLayout( capsuleWithPopup, { - label: 'CapsuleMultiSelectWidget with NumberInputWidget popup\u200E', + label: 'CapsuleMultiselectWidget with NumberInputWidget popup\u200E', align: 'top' } ), @@ -1429,6 +1409,76 @@ { align: 'top', label: 'ButtonInputWidget (frameless, using <input/>)\u200E' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ButtonWidget( { + label: 'Accesskey: I', + accessKey: 'i' + } ), + { + label: 'ButtonWidget (with accesskey)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ButtonSelectWidget( { + items: [ + new OO.ui.ButtonOptionWidget( { + data: 'a', + label: 'Accesskey: J', + accessKey: 'j' + } ), + new OO.ui.ButtonOptionWidget( { + data: 'b', + label: 'Accesskey: K', + accessKey: 'k' + } ), + new OO.ui.ButtonOptionWidget( { + data: 'c', + label: 'Accesskey: L', + accessKey: 'l' + } ) + ] + } ), + { + label: 'ButtonSelectWidget (with accesskeys)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.RadioSelectWidget( { + items: [ + new OO.ui.RadioOptionWidget( { + data: 'a', + label: 'Accesskey: M', + accessKey: 'm' + } ), + new OO.ui.RadioOptionWidget( { + data: 'b', + label: 'Accesskey: N', + accessKey: 'n' + } ), + new OO.ui.RadioOptionWidget( { + data: 'c', + label: 'Accesskey: O', + accessKey: 'o' + } ) + ] + } ), + { + align: 'top', + label: 'RadioSelectWidget (with accesskeys)\u200E' + } + ), + new OO.ui.FieldLayout( + new OO.ui.TextInputWidget( { + value: 'Accesskey: P', + accessKey: 'p' + } ), + { + label: 'TextInputWidget (with accesskey)\u200E', + align: 'top' } ) ] @@ -1906,7 +1956,7 @@ } ), new OO.ui.FieldLayout( - new OO.ui.CapsuleMultiSelectWidget( { + new OO.ui.CapsuleMultiselectWidget( { menu: { items: [ new OO.ui.MenuOptionWidget( { data: 'abc', label: 'Abc Label' } ), @@ -1916,7 +1966,7 @@ } } ).addItemsFromData( [ 'abc', 'def' ] ), { - label: 'Select from multiple CapsuleMultiSelectWidget items\u200E', + label: 'Select from multiple CapsuleMultiselectWidget items\u200E', align: 'top' } ), diff --git a/oojs/oojs-ui/demos/styles/demo.css b/oojs/oojs-ui/demos/styles/demo.css index 5b3fed0..1e3fda9 100644 --- a/oojs/oojs-ui/demos/styles/demo.css +++ b/oojs/oojs-ui/demos/styles/demo.css @@ -26,7 +26,7 @@ box-sizing: border-box; } -@media (max-width: 750px) { +@media ( max-width: 750px ) { .oo-ui-demo-menu { margin-bottom: 1em; } @@ -35,7 +35,7 @@ } } -@media (min-width: 751px) { +@media ( min-width: 751px ) { .oo-ui-demo-menu { margin-bottom: 2em; } @@ -97,7 +97,7 @@ } /* Console */ - +/* stylelint-disable selector-pseudo-element-colon-notation */ .oo-ui-demo-console { clear: both; position: relative; @@ -184,7 +184,7 @@ } .oo-ui-demo-console-log-line-error { - color: red; + color: #f00; } .oo-ui-demo-console-label { @@ -209,7 +209,7 @@ width: 20px; text-align: center; content: '→'; - color: blue; + color: #00f; } .oo-ui-demo-console-input { @@ -241,3 +241,4 @@ background: #eee; color: #333; } +/* stylelint-enable selector-pseudo-element-colon-notation */ diff --git a/oojs/oojs-ui/i18n/eu.json b/oojs/oojs-ui/i18n/eu.json index e507325..033c1b0 100644 --- a/oojs/oojs-ui/i18n/eu.json +++ b/oojs/oojs-ui/i18n/eu.json @@ -22,5 +22,6 @@ "ooui-dialog-process-continue": "Jarraitu", "ooui-selectfile-button-select": "Fitxategi bat aukeratu", "ooui-selectfile-not-supported": "Fitxategi aukeraketa ez da onartzen", - "ooui-selectfile-placeholder": "Ez da fitxategirik hautatu" + "ooui-selectfile-placeholder": "Ez da fitxategirik hautatu", + "ooui-selectfile-dragdrop-placeholder": "Fitxategia hemen utzi" } diff --git a/oojs/oojs-ui/i18n/gom-latn.json b/oojs/oojs-ui/i18n/gom-latn.json new file mode 100644 index 0000000..afd4710 --- /dev/null +++ b/oojs/oojs-ui/i18n/gom-latn.json @@ -0,0 +1,14 @@ +{ + "@metadata": { + "authors": [ + "The Discoverer" + ] + }, + "ooui-toolbar-more": "Anik", + "ooui-toolgroup-expand": "Anik", + "ooui-dialog-message-reject": "Rodd'dd kor", + "ooui-dialog-process-retry": "Porot proyotn kor", + "ooui-selectfile-button-select": "Ek fayl nivodd", + "ooui-selectfile-placeholder": "Khuimchech fayl nivddunk nam", + "ooui-selectfile-dragdrop-placeholder": "Fayl hanga udoi" +} diff --git a/oojs/oojs-ui/i18n/gor.json b/oojs/oojs-ui/i18n/gor.json new file mode 100644 index 0000000..ca0f1b4 --- /dev/null +++ b/oojs/oojs-ui/i18n/gor.json @@ -0,0 +1,23 @@ +{ + "@metadata": { + "authors": [ + "Marwan Mohamad" + ] + }, + "ooui-outline-control-move-down": "Heyiya botu ode tibawa", + "ooui-outline-control-move-up": "Heyiya botu ode yitaato", + "ooui-outline-control-remove": "Yinggila botu", + "ooui-toolbar-more": "Pe'eentapo", + "ooui-toolgroup-expand": "Pe'eentapo", + "ooui-toolgroup-collapse": "ngoolo botu", + "ooui-dialog-message-accept": "Jo", + "ooui-dialog-message-reject": "Bataliya", + "ooui-dialog-process-error": "Woluwo u yilotalawa", + "ooui-dialog-process-dismiss": "He'uti", + "ooui-dialog-process-retry": "Yimontali pooli", + "ooui-dialog-process-continue": "Turusi", + "ooui-selectfile-button-select": "Tulawota berkas tuwawu", + "ooui-selectfile-not-supported": "Berkas tilulawoto ja motuhatawa", + "ooui-selectfile-placeholder": "Diya'a berkas u letulawoto", + "ooui-selectfile-dragdrop-placeholder": "Dutuwa berkas teeya" +} diff --git a/oojs/oojs-ui/i18n/hr.json b/oojs/oojs-ui/i18n/hr.json index 36cc8eb..b07594c 100644 --- a/oojs/oojs-ui/i18n/hr.json +++ b/oojs/oojs-ui/i18n/hr.json @@ -19,5 +19,6 @@ "ooui-dialog-process-dismiss": "Zatvori", "ooui-dialog-process-retry": "Pokušajte ponovo", "ooui-selectfile-button-select": "Odaberi datoteku", - "ooui-selectfile-placeholder": "Datoteka nije označena" + "ooui-selectfile-placeholder": "Datoteka nije označena", + "ooui-selectfile-dragdrop-placeholder": "Povucite datoteku ovdje" } diff --git a/oojs/oojs-ui/i18n/lv.json b/oojs/oojs-ui/i18n/lv.json index 9ff787a..74658ce 100644 --- a/oojs/oojs-ui/i18n/lv.json +++ b/oojs/oojs-ui/i18n/lv.json @@ -10,12 +10,18 @@ }, "ooui-outline-control-move-down": "Pārvietot vienumu uz leju", "ooui-outline-control-move-up": "Pārvietot vienumu uz augšu", + "ooui-outline-control-remove": "Noņemt vienumu", "ooui-toolbar-more": "Vairāk", "ooui-toolgroup-expand": "Vairāk", "ooui-toolgroup-collapse": "Mazāk", "ooui-dialog-message-accept": "Labi", "ooui-dialog-message-reject": "Atcelt", "ooui-dialog-process-error": "Kaut kas nogāja greizi", + "ooui-dialog-process-dismiss": "Paslēpt", "ooui-dialog-process-retry": "Mēģināt vēlreiz", - "ooui-dialog-process-continue": "Turpināt" + "ooui-dialog-process-continue": "Turpināt", + "ooui-selectfile-button-select": "Izvēlies failu", + "ooui-selectfile-not-supported": "Failu izvēle nav atbalstīta", + "ooui-selectfile-placeholder": "Nav izvēlēts neviens fails", + "ooui-selectfile-dragdrop-placeholder": "Nomet failu šeit" } diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index ba3f220..70fa829 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.17.2", + "version": "0.17.3", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", @@ -21,40 +21,40 @@ "demos": "grunt publish-build && grunt demos" }, "dependencies": { - "es5-shim": "4.1.14", + "es5-shim": "4.5.8", "jquery": "1.11.3", "oojs": "1.1.10" }, "devDependencies": { - "grunt-banana-checker": "0.4.0", - "grunt-cli": "0.1.13", + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", "grunt-contrib-clean": "1.0.0", - "grunt-contrib-concat": "1.0.0", + "grunt-contrib-concat": "1.0.1", "grunt-contrib-copy": "1.0.0", - "grunt-contrib-csslint": "1.0.0", "grunt-contrib-cssmin": "1.0.1", "grunt-contrib-jshint": "1.0.0", - "grunt-contrib-less": "1.2.0", + "grunt-contrib-less": "1.3.0", "grunt-contrib-uglify": "1.0.1", "grunt-contrib-watch": "1.0.0", - "grunt-csscomb": "3.1.0", - "grunt-cssjanus": "0.2.4", - "grunt-exec": "0.4.6", - "grunt-file-exists": "0.1.3", - "grunt-image": "1.3.0", + "grunt-csscomb": "git://github.com/jdforrester/grunt-csscomb.git#v3.1.0-wmf.1", + "grunt-cssjanus": "0.3.2", + "grunt-exec": "0.4.7", + "grunt-file-exists": "0.1.4", + "grunt-image": "1.5.1", "grunt-jscs": "2.8.0", "grunt-jsonlint": "1.0.7", - "grunt-karma": "0.12.2", - "grunt-promise-q": "0.1.1", + "grunt-karma": "1.0.0", + "grunt-promise-q": "git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1", + "grunt-stylelint": "0.3.0", "grunt-svg2png": "git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1", "grunt-tyops": "0.1.0", - "grunt": "0.4.5", - "karma-chrome-launcher": "0.2.2", - "karma-coverage": "0.5.5", - "karma-firefox-launcher": "0.1.7", - "karma-qunit": "0.1.9", "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-firefox-launcher": "1.0.0", + "karma-qunit": "1.0.0", "q": "1.4.1", - "qunitjs": "1.22.0" + "qunitjs": "1.22.0", + "stylelint-config-wikimedia": "0.2.0" } } diff --git a/oojs/oojs-ui/php/widgets/TextInputWidget.php b/oojs/oojs-ui/php/widgets/TextInputWidget.php index e06c144..fd81142 100644 --- a/oojs/oojs-ui/php/widgets/TextInputWidget.php +++ b/oojs/oojs-ui/php/widgets/TextInputWidget.php @@ -148,15 +148,16 @@ } private function getSaneType( $config ) { - if ( isset( $config['multiline'] ) && $config['multiline'] ) { - return 'multiline'; - } else { - $type = in_array( - $config['type'], - [ 'text', 'password', 'search', 'email', 'url', 'date', 'number' ] - ) ? $config['type'] : 'text'; - return $type; - } + $allowedTypes = [ + 'text', + 'password', + 'search', + 'email', + 'url', + 'date', + 'number' + ]; + return in_array( $config['type'], $allowedTypes ) ? $config['type'] : 'text'; } /** @@ -175,11 +176,9 @@ if ( $rows !== null ) { $config['rows'] = $rows; } - } else { - $type = $this->input->getAttribute( 'type' ); - if ( $type !== 'text' ) { - $config['type'] = $type; - } + } + if ( $this->type !== 'text' ) { + $config['type'] = $this->type; } if ( $this->isReadOnly() ) { $config['readOnly'] = true; -- To view, visit https://gerrit.wikimedia.org/r/290602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fe38754c18a83554593479ea1b01f8a60144435 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
