Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/249188
Change subject: Update OOjs UI to v0.13.0 ...................................................................... Update OOjs UI to v0.13.0 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.13.0/History.md Change-Id: Ie4f66b15f4f5ec9932d5fd72e12b4453724e3742 --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/AUTHORS.txt M oojs/oojs-ui/History.md M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/i18n/bs.json M oojs/oojs-ui/i18n/cs.json M oojs/oojs-ui/i18n/fi.json M oojs/oojs-ui/i18n/nl.json M oojs/oojs-ui/package.json 11 files changed, 129 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/88/249188/1 diff --git a/composer.json b/composer.json index 73e8717..6266abd 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.14.0", "nmred/kafka-php": "0.1.4", - "oojs/oojs-ui": "0.12.12", + "oojs/oojs-ui": "0.13.0", "oyejorge/less.php": "1.7.0.9", "php": ">=5.3.3", "psr/log": "1.0.0", diff --git a/composer.lock b/composer.lock index cc972c1..689b18a 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": "53f99794279316ccfda3af4b55f86d86", - "content-hash": "c83ea88ae5d18d726e2d9e8e5f31c68e", + "hash": "6cbfc5336db52f3d4ebda2199ee19ff8", + "content-hash": "02a8b68e2584449d53b035618d6c733d", "packages": [ { "name": "composer/semver", @@ -392,16 +392,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.12.12", + "version": "v0.13.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "221a66e8df215e767ff4b55b637138a73fcffdb2" + "reference": "4508cebcf5f2db272578c33e5c83b9a90dbe779f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/221a66e8df215e767ff4b55b637138a73fcffdb2";, - "reference": "221a66e8df215e767ff4b55b637138a73fcffdb2", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/4508cebcf5f2db272578c33e5c83b9a90dbe779f";, + "reference": "4508cebcf5f2db272578c33e5c83b9a90dbe779f", "shasum": "" }, "require": { @@ -410,7 +410,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9", - "mediawiki/mediawiki-codesniffer": "0.4.0", + "mediawiki/mediawiki-codesniffer": "0.5.0", "phpunit/phpunit": "~4.5" }, "type": "library", @@ -424,6 +424,10 @@ "MIT" ], "authors": [ + { + "name": "Timo Tijhof", + "email": "[email protected]" + }, { "name": "Bartosz Dziewoński", "email": "[email protected]" @@ -449,17 +453,13 @@ "email": "[email protected]" }, { - "name": "Timo Tijhof", - "email": "[email protected]" - }, - { "name": "Trevor Parscal", "email": "[email protected]" } ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2015-10-13 20:29:29" + "time": "2015-10-27 17:33:57" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index f459774..63a93ae 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1103,17 +1103,17 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.12.12", - "version_normalized": "0.12.12.0", + "version": "v0.13.0", + "version_normalized": "0.13.0.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "221a66e8df215e767ff4b55b637138a73fcffdb2" + "reference": "4508cebcf5f2db272578c33e5c83b9a90dbe779f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/221a66e8df215e767ff4b55b637138a73fcffdb2";, - "reference": "221a66e8df215e767ff4b55b637138a73fcffdb2", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/4508cebcf5f2db272578c33e5c83b9a90dbe779f";, + "reference": "4508cebcf5f2db272578c33e5c83b9a90dbe779f", "shasum": "" }, "require": { @@ -1122,10 +1122,10 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9", - "mediawiki/mediawiki-codesniffer": "0.4.0", + "mediawiki/mediawiki-codesniffer": "0.5.0", "phpunit/phpunit": "~4.5" }, - "time": "2015-10-13 20:29:29", + "time": "2015-10-27 17:33:57", "type": "library", "installation-source": "dist", "autoload": { @@ -1138,6 +1138,10 @@ "MIT" ], "authors": [ + { + "name": "Timo Tijhof", + "email": "[email protected]" + }, { "name": "Bartosz Dziewoński", "email": "[email protected]" @@ -1161,10 +1165,6 @@ { "name": "Roan Kattouw", "email": "[email protected]" - }, - { - "name": "Timo Tijhof", - "email": "[email protected]" }, { "name": "Trevor Parscal", diff --git a/oojs/oojs-ui/AUTHORS.txt b/oojs/oojs-ui/AUTHORS.txt index cc0970d..e845452 100644 --- a/oojs/oojs-ui/AUTHORS.txt +++ b/oojs/oojs-ui/AUTHORS.txt @@ -6,7 +6,7 @@ Kirsten Menger-Anderson <[email protected]> Roan Kattouw <[email protected]> Rob Moen <[email protected]> -Timo Tijhof <[email protected]> +Timo Tijhof <[email protected]> Trevor Parscal <[email protected]> Patch Contributors (minor contributors, alphabetically) diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md index d7d5fbc..1cbf79a 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,5 +1,29 @@ # OOjs UI Release History +## v0.13.0 / 2015-10-27 +### Breaking changes +* [BREAKING CHANGE] Remove aliases for OO.ui.mixins, deprecated in 0.11.4 (C. Scott Ananian) +* [BREAKING CHANGE] Turn Element#gatherPreInfuseState into a static method (Bartosz Dziewoński) + +### Features +* Update outline widget when current item is scrolled out of view (Ed Sanders) +* TextInputWidget: Emit 'resize' events (Ed Sanders) +* TextInputWidget: Fix scrollbars in `<textarea>`s in IE8-11 (Ed Sanders) +* TextInputWidget: Improve selection API (Ed Sanders) + +### Styles +* MediaWiki theme: Adjust ToggleSwitchWidget to match M61 design (Volker E) +* Follow-up I54f1e3c92: Fix placement of cursors on checkbox/radio widgets (Volker E) +* Follow-up I598e7b25a: Apply MenuToolGroup missing styles fix to Apex theme (Ed Sanders) + +### Code +* Consistently use '`//`' rather than '`/* */`' for Less comments (Bartosz Dziewoński) +* Remove obsolete Opera<12.1 vendor prefixes (Volker E) +* Remove unnecessary IE10beta vendor-prefixes from OOjs UI (Volker E) +* build: Switch back to upstream version of grunt-contrib-concat (Timo Tijhof) +* build: Updating development dependencies (Kunal Mehta) +* build: Use my Gmail address for attribution (Timo Tijhof) + ## v0.12.12 / 2015-10-13 ### Features * CapsuleMultiSelectWidget: When 'allowArbitrary' is true, don't require 'Enter' to confirm (Bartosz Dziewoński) diff --git a/oojs/oojs-ui/demos/pages/dialogs.js b/oojs/oojs-ui/demos/pages/dialogs.js index ff3b0bb..3e99ecb 100644 --- a/oojs/oojs-ui/demos/pages/dialogs.js +++ b/oojs/oojs-ui/demos/pages/dialogs.js @@ -163,7 +163,7 @@ function SamplePage( name, config ) { config = $.extend( { label: 'Sample page' }, config ); - OO.ui.PageLayout.call( this, name, config ); + SamplePage.parent.apply( this, arguments ); this.label = config.label; this.icon = config.icon; if ( this.$element.is( ':empty' ) ) { @@ -255,7 +255,7 @@ OutlinedBookletDialog.parent.call( this, config ); } OO.inheritClass( OutlinedBookletDialog, OO.ui.ProcessDialog ); - OutlinedBookletDialog.static.title = 'Booklet dialog'; + OutlinedBookletDialog.static.title = 'Outlined booklet dialog'; OutlinedBookletDialog.static.actions = [ { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, { action: 'cancel', label: 'Cancel', flags: 'safe' } @@ -295,6 +295,65 @@ return OutlinedBookletDialog.parent.prototype.getSetupProcess.call( this, data ) .next( function () { this.bookletLayout.setPage( this.getSize() ); + }, this ); + }; + + function ContinuousOutlinedBookletDialog( config ) { + ContinuousOutlinedBookletDialog.parent.call( this, config ); + } + OO.inheritClass( ContinuousOutlinedBookletDialog, OO.ui.ProcessDialog ); + ContinuousOutlinedBookletDialog.static.title = 'Continuous outlined booklet dialog'; + ContinuousOutlinedBookletDialog.static.actions = [ + { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, + { action: 'cancel', label: 'Cancel', flags: 'safe' } + ]; + ContinuousOutlinedBookletDialog.prototype.getBodyHeight = function () { + return 250; + }; + ContinuousOutlinedBookletDialog.prototype.initialize = function () { + var lipsum; + ContinuousOutlinedBookletDialog.parent.prototype.initialize.apply( this, arguments ); + this.bookletLayout = new OO.ui.BookletLayout( { + outlined: true, + continuous: true + } ); + lipsum = [ + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque eleifend justo nec erat tempus, quis aliquet augue aliquam. Sed rutrum odio in tellus pharetra, ut mollis est fermentum. ' + + 'Sed egestas dolor libero, a aliquet sem finibus eu. Morbi dolor nisl, pulvinar vitae maximus sed, lacinia eu ipsum. Fusce rutrum placerat massa, vel vehicula nisi viverra nec. ' + + 'Nam at turpis vel nisi efficitur tempor. Interdum et malesuada fames ac ante ipsum primis in faucibus. Morbi aliquam pulvinar fermentum. Maecenas rutrum accumsan lorem ac sagittis. ' + + 'Praesent id nunc gravida, iaculis odio eu, maximus ligula. Praesent ut tellus mollis, pharetra orci vitae, interdum lacus. Nulla sodales lacus eget libero pellentesque tempor.', + 'Ut a metus elementum, eleifend velit et, malesuada enim.', + 'Aenean sem eros, rutrum vitae pulvinar at, vulputate id quam. Quisque tincidunt, ligula pulvinar consequat tempor, tellus erat lobortis nisl, non euismod diam nisl ut libero. Etiam mollis, ' + + 'risus a tincidunt efficitur, ipsum justo ullamcorper sem, id gravida dui lacus quis turpis. In consectetur tincidunt elit in mollis. Sed nec ultricies turpis, at dictum risus. Curabitur ipsum diam, ' + + 'aliquet sit amet ante eu, congue cursus magna. Donec at lectus in nulla ornare faucibus. Vestibulum mattis massa eu convallis convallis. Sed tristique ut quam non eleifend. Nunc aliquam, nisi non ' + + 'posuere dictum, est nunc mollis nisl.', + 'Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce laoreet mi mi, nec tempor erat posuere malesuada. Nam dignissim at nisl ac aliquet. In fermentum ' + + 'mauris et tellus fermentum rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam hendrerit diam mauris, id rutrum justo malesuada nec. Duis ', + 'Ut fringilla enim nec augue rutrum, nec vestibulum orci sollicitudin. Donec eget ex tincidunt augue ullamcorper efficitur at sed odio. Praesent ac interdum elit. Suspendisse blandit feugiat pulvinar. ' + ]; + this.pages = [ + new SamplePage( 'page1', { label: 'Page 1', icon: 'window', content: [ $( '<h3>' ).text( 'Page 1' ), lipsum[ 0 ] ] } ), + new SamplePage( 'page2', { label: 'Page 2', icon: 'window', content: [ $( '<h3>' ).text( 'Page 2' ), lipsum[ 1 ] ] } ), + new SamplePage( 'page3', { label: 'Page 3', icon: 'window', content: [ $( '<h3>' ).text( 'Page 3' ), lipsum[ 2 ] ] } ), + new SamplePage( 'page4', { label: 'Page 4', icon: 'window', content: [ $( '<h3>' ).text( 'Page 4' ), lipsum[ 3 ] ] } ), + new SamplePage( 'page5', { label: 'Page 5', icon: 'window', content: [ $( '<h3>' ).text( 'Page 5' ), lipsum[ 4 ] ] } ) + ]; + + this.bookletLayout.addPages( this.pages ); + this.$body.append( this.bookletLayout.$element ); + }; + ContinuousOutlinedBookletDialog.prototype.getActionProcess = function ( action ) { + if ( action ) { + return new OO.ui.Process( function () { + this.close( { action: action } ); + }, this ); + } + return ContinuousOutlinedBookletDialog.parent.prototype.getActionProcess.call( this, action ); + }; + ContinuousOutlinedBookletDialog.prototype.getSetupProcess = function ( data ) { + return ContinuousOutlinedBookletDialog.parent.prototype.getSetupProcess.call( this, data ) + .next( function () { + this.bookletLayout.setPage( 'page1' ); }, this ); }; @@ -639,6 +698,13 @@ } }, { + name: 'Continuous outlined booklet dialog', + dialogClass: ContinuousOutlinedBookletDialog, + config: { + size: 'medium' + } + }, + { name: 'Indexed dialog', dialogClass: IndexedDialog, config: { diff --git a/oojs/oojs-ui/i18n/bs.json b/oojs/oojs-ui/i18n/bs.json index d6f61ae..162790e 100644 --- a/oojs/oojs-ui/i18n/bs.json +++ b/oojs/oojs-ui/i18n/bs.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "DzWiki", - "Semso98" + "Semso98", + "Srdjan m" ] }, "ooui-outline-control-move-down": "Premjesti stavku dolje", @@ -16,5 +17,6 @@ "ooui-dialog-process-error": "Nešto je pošlo naopako", "ooui-dialog-process-dismiss": "Odbaci", "ooui-dialog-process-retry": "Pokušajte ponovo", - "ooui-dialog-process-continue": "Nastavi" + "ooui-dialog-process-continue": "Nastavi", + "ooui-selectfile-placeholder": "Nijedna datoteka nije izabrana" } diff --git a/oojs/oojs-ui/i18n/cs.json b/oojs/oojs-ui/i18n/cs.json index 0d86aa6..fb93e3a 100644 --- a/oojs/oojs-ui/i18n/cs.json +++ b/oojs/oojs-ui/i18n/cs.json @@ -26,6 +26,7 @@ "ooui-dialog-process-dismiss": "Zavřít", "ooui-dialog-process-retry": "Zkusit znovu", "ooui-dialog-process-continue": "Pokračovat", + "ooui-selectfile-button-select": "Vybrat soubor", "ooui-selectfile-not-supported": "Výběr souboru není podporován", "ooui-selectfile-placeholder": "Nebyl vybrán žádný soubor" } diff --git a/oojs/oojs-ui/i18n/fi.json b/oojs/oojs-ui/i18n/fi.json index bdf015f..0b9e149 100644 --- a/oojs/oojs-ui/i18n/fi.json +++ b/oojs/oojs-ui/i18n/fi.json @@ -29,7 +29,8 @@ "ooui-dialog-process-dismiss": "Hylkää", "ooui-dialog-process-retry": "Yritä uudelleen", "ooui-dialog-process-continue": "Jatka", + "ooui-selectfile-button-select": "Valitse tiedosto", "ooui-selectfile-not-supported": "Tiedoston valitsemista ei tueta", "ooui-selectfile-placeholder": "Tiedostoa ei ole valittu", - "ooui-selectfile-dragdrop-placeholder": "Pudota tiedosto (tai selaa tiedostoja napsauttamalla)" + "ooui-selectfile-dragdrop-placeholder": "Pudota tiedosto tähän" } diff --git a/oojs/oojs-ui/i18n/nl.json b/oojs/oojs-ui/i18n/nl.json index 515eada..d222d1c 100644 --- a/oojs/oojs-ui/i18n/nl.json +++ b/oojs/oojs-ui/i18n/nl.json @@ -32,6 +32,8 @@ "ooui-dialog-process-dismiss": "Sluiten", "ooui-dialog-process-retry": "Opnieuw proberen", "ooui-dialog-process-continue": "Doorgaan", + "ooui-selectfile-button-select": "Selecteer een bestand", "ooui-selectfile-not-supported": "Selectie van een bestand wordt niet ondersteund", - "ooui-selectfile-placeholder": "Er is geen bestand geselecteerd" + "ooui-selectfile-placeholder": "Er is geen bestand geselecteerd", + "ooui-selectfile-dragdrop-placeholder": "Sleep hier een bestand heen" } diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index a9ff8b1..ba383ef 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.12.12", + "version": "0.13.0", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", @@ -30,7 +30,7 @@ "grunt-banana-checker": "0.4.0", "grunt-cli": "0.1.13", "grunt-contrib-clean": "0.6.0", - "grunt-contrib-concat-sourcemaps": "0.6.0", + "grunt-contrib-concat": "0.5.1", "grunt-contrib-copy": "0.8.1", "grunt-contrib-csslint": "0.5.0", "grunt-contrib-cssmin": "0.14.0", -- To view, visit https://gerrit.wikimedia.org/r/249188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4f66b15f4f5ec9932d5fd72e12b4453724e3742 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
