Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401601 )
Change subject: Update OOjs UI to v0.24.3 ...................................................................... Update OOjs UI to v0.24.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.3 Change-Id: Ia54fb8fddc159f1612ca3038cdbd7da63935aa83 --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/package.json M oojs/oojs-ui/php/layouts/FieldLayout.php M oojs/oojs-ui/php/layouts/FieldsetLayout.php M oojs/oojs-ui/php/widgets/ComboBoxInputWidget.php M oojs/oojs-ui/php/widgets/DropdownInputWidget.php 11 files changed, 150 insertions(+), 92 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/01/401601/1 diff --git a/composer.json b/composer.json index 43a287e..2a301fb 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,7 @@ "mustangostang/spyc": "0.6.2", "nikic/php-parser": "3.0.6", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.24.3", + "oojs/oojs-ui": "0.24.4", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.4.1", diff --git a/composer.lock b/composer.lock index e951df0..ce43222 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, "This file is @generated automatically" ], - "content-hash": "0b0c92189aae81bde1fb6d836cf4bbe6", + "content-hash": "506d0921e5d6d3a2257c3e92d15d1bec", "packages": [ { "name": "composer/semver", @@ -1192,16 +1192,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.24.3", + "version": "v0.24.4", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "a48d69b22bf89b87f2f931a4c23401e6214562d4" + "reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/a48d69b22bf89b87f2f931a4c23401e6214562d4";, - "reference": "a48d69b22bf89b87f2f931a4c23401e6214562d4", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/b3598ebd9f7c5218a0be02a4d683cc5c76762a78";, + "reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78", "shasum": "" }, "require": { @@ -1267,7 +1267,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2017-11-28T23:14:25+00:00" + "time": "2017-12-20T21:56:38+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 0f51359..a1483b6 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -3609,87 +3609,6 @@ ] }, { - "name": "oojs/oojs-ui", - "version": "v0.24.3", - "version_normalized": "0.24.3.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "a48d69b22bf89b87f2f931a4c23401e6214562d4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/a48d69b22bf89b87f2f931a4c23401e6214562d4";, - "reference": "a48d69b22bf89b87f2f931a4c23401e6214562d4", - "shasum": "" - }, - "require": { - "mediawiki/at-ease": "1.1.0", - "php": ">=5.5.9" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", - "phpunit/phpunit": "4.8.21" - }, - "time": "2017-11-28T23:14:25+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "php/" - ] - }, - "notification-url": "https://packagist.org/downloads/";, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Timo Tijhof", - "email": "[email protected]" - }, - { - "name": "Bartosz Dziewoński", - "email": "[email protected]" - }, - { - "name": "Ed Sanders", - "email": "[email protected]" - }, - { - "name": "James D. Forrester", - "email": "[email protected]" - }, - { - "name": "Kirsten Menger-Anderson", - "email": "[email protected]" - }, - { - "name": "Rob Moen", - "email": "[email protected]" - }, - { - "name": "Roan Kattouw", - "email": "[email protected]" - }, - { - "name": "Trevor Parscal", - "email": "[email protected]" - }, - { - "name": "Kunal Mehta", - "email": "[email protected]" - }, - { - "name": "Prateek Saxena", - "email": "[email protected]" - } - ], - "description": "Provides library of common widgets, layouts, and windows.", - "homepage": "https://www.mediawiki.org/wiki/OOjs_UI"; - }, - { "name": "pear/mail_mime", "version": "1.10.2", "version_normalized": "1.10.2.0", @@ -3827,5 +3746,86 @@ } ], "description": "Parsing and pretty-printing Lucene explain data" + }, + { + "name": "oojs/oojs-ui", + "version": "v0.24.4", + "version_normalized": "0.24.4.0", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/oojs-ui.git";, + "reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/b3598ebd9f7c5218a0be02a4d683cc5c76762a78";, + "reference": "b3598ebd9f7c5218a0be02a4d683cc5c76762a78", + "shasum": "" + }, + "require": { + "mediawiki/at-ease": "1.1.0", + "php": ">=5.5.9" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "14.1.0", + "phpunit/phpunit": "4.8.21" + }, + "time": "2017-12-20T21:56:38+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "php/" + ] + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Timo Tijhof", + "email": "[email protected]" + }, + { + "name": "Bartosz Dziewoński", + "email": "[email protected]" + }, + { + "name": "Ed Sanders", + "email": "[email protected]" + }, + { + "name": "James D. Forrester", + "email": "[email protected]" + }, + { + "name": "Kirsten Menger-Anderson", + "email": "[email protected]" + }, + { + "name": "Rob Moen", + "email": "[email protected]" + }, + { + "name": "Roan Kattouw", + "email": "[email protected]" + }, + { + "name": "Trevor Parscal", + "email": "[email protected]" + }, + { + "name": "Kunal Mehta", + "email": "[email protected]" + }, + { + "name": "Prateek Saxena", + "email": "[email protected]" + } + ], + "description": "Provides library of common widgets, layouts, and windows.", + "homepage": "https://www.mediawiki.org/wiki/OOjs_UI"; } ] diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md index c9f9787..fa31454 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,4 +1,22 @@ # OOjs UI Release History +## v0.24.4 / 2017-12-20 special release +### Deprecations +* [DEPRECATING CHANGE] icons: Flag unused 'bellOn' icon as to be removed (Volker E.) +* [DEPRECATING CHANGE] icons: Flag unused 'quotesAdd' & 'redirect' as to be removed (Volker E.) + +### Features +* Introduce `OO.ui.getDefaultOverlay` (Bartosz Dziewoński) +* Put menus/popups of infused PHP widgets into the default overlay (Bartosz Dziewoński) + +### Styles +* icons: Add 'lightbulb' icon (Prateek Saxena) +* icons: Add 'stop' icon to Apex theme (Volker E.) + +### Code +* ClippableElement: Fix JS error when Floatable is mixed in but disabled (Roan Kattouw) +* DropdownWidget: Remove stray use of `this.$()` (Bartosz Dziewoński) + + ## v0.24.3 / 2017-11-28 ### Features * Allow adding virtual viewport spacing (Bartosz Dziewoński) diff --git a/oojs/oojs-ui/demos/pages/icons.js b/oojs/oojs-ui/demos/pages/icons.js index 8ae0e63..1f02500 100644 --- a/oojs/oojs-ui/demos/pages/icons.js +++ b/oojs/oojs-ui/demos/pages/icons.js @@ -37,7 +37,6 @@ alerts: [ 'alert', 'bell', - 'bellOn', 'comment', 'message', 'notice', @@ -62,6 +61,7 @@ 'help', 'key', 'keyboard', + 'lightbulb', 'logOut', 'newWindow', 'printer', @@ -133,7 +133,6 @@ 'outline', 'puzzle', 'quotes', - 'quotesAdd', 'searchCaseSensitive', 'searchDiacritics', 'searchRegularExpression', diff --git a/oojs/oojs-ui/demos/pages/widgets.js b/oojs/oojs-ui/demos/pages/widgets.js index 713f536..1380214 100644 --- a/oojs/oojs-ui/demos/pages/widgets.js +++ b/oojs/oojs-ui/demos/pages/widgets.js @@ -1310,6 +1310,36 @@ new OO.ui.FieldLayout( new OO.ui.DropdownWidget( { label: 'Select one', + $overlay: true, + menu: { + items: [ + new OO.ui.MenuOptionWidget( { + data: 'a', + label: 'First' + } ), + new OO.ui.MenuOptionWidget( { + data: 'b', + label: 'Second' + } ), + new OO.ui.MenuOptionWidget( { + data: 'c', + label: 'Third' + } ), + new OO.ui.MenuOptionWidget( { + data: 'd', + label: 'Fourth' + } ) + ] + } + } ), + { + label: 'DropdownWidget (using default overlay)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.DropdownWidget( { + label: 'Select one', $overlay: $overlay, menu: { items: [ @@ -1333,7 +1363,7 @@ } } ), { - label: 'DropdownWidget (using overlay)\u200E', + label: 'DropdownWidget (using custom overlay)\u200E', align: 'top' } ), @@ -2957,6 +2987,9 @@ $overlay.appendTo( 'body' ); demo.once( 'destroy', function () { + // We are removing all of the widgets from the page, so also remove their "detached" + // menus and stuff, otherwise they can remain visible forever. $overlay.remove(); + OO.ui.$defaultOverlay.empty(); } ); }; diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index 0e10483..7ab1775 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.24.3", + "version": "0.24.4", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", diff --git a/oojs/oojs-ui/php/layouts/FieldLayout.php b/oojs/oojs-ui/php/layouts/FieldLayout.php index e070605..0160a4e 100644 --- a/oojs/oojs-ui/php/layouts/FieldLayout.php +++ b/oojs/oojs-ui/php/layouts/FieldLayout.php @@ -247,6 +247,7 @@ if ( $this->help !== '' ) { $config['help'] = $this->help->getTitle(); } + $config['$overlay'] = true; return parent::getConfig( $config ); } } diff --git a/oojs/oojs-ui/php/layouts/FieldsetLayout.php b/oojs/oojs-ui/php/layouts/FieldsetLayout.php index a161008..d69d2ff 100644 --- a/oojs/oojs-ui/php/layouts/FieldsetLayout.php +++ b/oojs/oojs-ui/php/layouts/FieldsetLayout.php @@ -46,4 +46,9 @@ $this->addItems( $config['items'] ); } } + + public function getConfig( &$config ) { + $config['$overlay'] = true; + return parent::getConfig( $config ); + } } diff --git a/oojs/oojs-ui/php/widgets/ComboBoxInputWidget.php b/oojs/oojs-ui/php/widgets/ComboBoxInputWidget.php index c2f8d34..d2fe471 100644 --- a/oojs/oojs-ui/php/widgets/ComboBoxInputWidget.php +++ b/oojs/oojs-ui/php/widgets/ComboBoxInputWidget.php @@ -74,6 +74,7 @@ if ( $this->forceAutocomplete ) { $config['autocomplete'] = true; } + $config['$overlay'] = true; return parent::getConfig( $config ); } } diff --git a/oojs/oojs-ui/php/widgets/DropdownInputWidget.php b/oojs/oojs-ui/php/widgets/DropdownInputWidget.php index 83430f5..a453b7b 100644 --- a/oojs/oojs-ui/php/widgets/DropdownInputWidget.php +++ b/oojs/oojs-ui/php/widgets/DropdownInputWidget.php @@ -107,6 +107,7 @@ } } $config['options'] = $o; + $config['dropdown']['$overlay'] = true; return parent::getConfig( $config ); } } -- To view, visit https://gerrit.wikimedia.org/r/401601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia54fb8fddc159f1612ca3038cdbd7da63935aa83 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
