jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.16.5 ......................................................................
Update OOjs UI to v0.16.5 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.16.5/History.md Change-Id: Ib5b0dc12259ac85ff1589c0e1507238f1089da3f --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/demos/pages/widgets.js A oojs/oojs-ui/i18n/azb.json M oojs/oojs-ui/i18n/ka.json A oojs/oojs-ui/i18n/khw.json M oojs/oojs-ui/i18n/nan.json M oojs/oojs-ui/i18n/zh-hant.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/mixins/GroupElement.php 14 files changed, 198 insertions(+), 106 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index f690f0c..4da696e 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "mediawiki/at-ease": "1.1.0", "monolog/monolog": "1.18.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.16.4", + "oojs/oojs-ui": "0.16.5", "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 50d4319..e52c00e 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": "a770ce5554cf0d09acbf0608ca4dfc6b", - "content-hash": "e14a89c448cd54faacb7862b1af685c8", + "hash": "c9ce5d5cf7e3c1871e6ea169a0b790b0", + "content-hash": "7ada4208b27c7b8c168dbb83bf57f724", "packages": [ { "name": "composer/semver", @@ -364,16 +364,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.16.4", + "version": "v0.16.5", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "7047e7f7a2a02bb267d2f81e4895c84c379e6e20" + "reference": "be8d85ef13a3149ffe37a25e8e1766cab7ec4d6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/7047e7f7a2a02bb267d2f81e4895c84c379e6e20";, - "reference": "7047e7f7a2a02bb267d2f81e4895c84c379e6e20", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/be8d85ef13a3149ffe37a25e8e1766cab7ec4d6c";, + "reference": "be8d85ef13a3149ffe37a25e8e1766cab7ec4d6c", "shasum": "" }, "require": { @@ -439,7 +439,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2016-03-22 22:14:46" + "time": "2016-04-07 14:47:36" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 0681226..28a2e0d 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1371,87 +1371,6 @@ "description": "Composer plugin to merge multiple composer.json files" }, { - "name": "oojs/oojs-ui", - "version": "v0.16.4", - "version_normalized": "0.16.4.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "7047e7f7a2a02bb267d2f81e4895c84c379e6e20" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/7047e7f7a2a02bb267d2f81e4895c84c379e6e20";, - "reference": "7047e7f7a2a02bb267d2f81e4895c84c379e6e20", - "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": "0.6.0", - "phpunit/phpunit": "4.8.21" - }, - "time": "2016-03-22 22:14:46", - "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": "ruflin/elastica", "version": "2.3.1", "version_normalized": "2.3.1.0", @@ -1764,5 +1683,86 @@ "logging", "psr-3" ] + }, + { + "name": "oojs/oojs-ui", + "version": "v0.16.5", + "version_normalized": "0.16.5.0", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/oojs-ui.git";, + "reference": "be8d85ef13a3149ffe37a25e8e1766cab7ec4d6c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/be8d85ef13a3149ffe37a25e8e1766cab7ec4d6c";, + "reference": "be8d85ef13a3149ffe37a25e8e1766cab7ec4d6c", + "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": "0.6.0", + "phpunit/phpunit": "4.8.21" + }, + "time": "2016-04-07 14:47:36", + "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 c52310d..6a993ee 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,5 +1,29 @@ # OOjs UI Release History +## v0.16.5 / 2016-04-07 +### Styles +* Prevent modal windows from exceeding available height on Firefox (Bartosz Dziewoński) +* Apex, MediaWiki themes: Add "articles" icon (Marc A. Pelletier) +* DropdownInputWidget: Give un-infused widget cursor:pointer (Ed Sanders) +* RadioSelectInputWidget: Match PHP styling to JS (Bartosz Dziewoński) + +### Code +* ComboBoxInputWidget: Disable autocomplete by default (James D. Forrester) +* GroupElement: Add change event (Prateek Saxena) +* GroupElement.php: Use strict mode in array_search (James D. Forrester) +* styles: Lower specifity of CSS type attribute selectors (Volker E) +* styles: Minor cleanup and unification of values and comments (Volker E) +* styles: Remove unnecessary `resize` property from `select` (Volker E) +* MediaWiki theme: Exchange `rgba()` with hex CSS colors to support IE 8 (Volker E) +* MediaWiki theme: Replace fixed CSS property values with variables (Volker E) +* RadioSelectInputWidget: Don't try to reuse DOM when infusing (Bartosz Dziewoński) +* TextInputWidget: Use getValidity in demos (Ricordisamoa) +* Window: Correct documentation (Bartosz Dziewoński) +* build: Add browserNoActivityTimeout to karma (Paladox) +* build: For grunt-svg2png use a tag instead of git hash (Paladox) +* build: Update demos script to also run grunt publish-build (Paladox) +* build: Use a version of grunt-svg2png without a rate-limited CDN (Paladox) + ## v0.16.4 / 2016-03-22 ### Features * NumberInputWidget: Optionally don't show the increment buttons (Thalia Chan) diff --git a/oojs/oojs-ui/demos/pages/dialogs.js b/oojs/oojs-ui/demos/pages/dialogs.js index 083b612..720deb6 100644 --- a/oojs/oojs-ui/demos/pages/dialogs.js +++ b/oojs/oojs-ui/demos/pages/dialogs.js @@ -95,6 +95,39 @@ return this.content.$element.outerHeight( true ); }; + function LongProcessDialog( config ) { + ProcessDialog.parent.call( this, config ); + } + OO.inheritClass( LongProcessDialog, OO.ui.ProcessDialog ); + LongProcessDialog.static.title = 'Process dialog'; + LongProcessDialog.static.actions = [ + { action: 'save', label: 'Done', flags: [ 'primary', 'progressive' ] }, + { action: 'cancel', label: 'Cancel', flags: 'safe' }, + { action: 'other', label: 'Other', flags: 'other' } + ]; + LongProcessDialog.prototype.initialize = function () { + var i; + + LongProcessDialog.parent.prototype.initialize.apply( this, arguments ); + this.content = new OO.ui.PanelLayout( { padded: true, expanded: false } ); + for ( i = 0; i < 100; i++ ) { + this.content.$element.append( '<p>Dialog content</p>' ); + } + this.$body.append( this.content.$element ); + }; + LongProcessDialog.prototype.getActionProcess = function ( action ) { + var dialog = this; + if ( action ) { + return new OO.ui.Process( function () { + dialog.close( { action: action } ); + } ); + } + return LongProcessDialog.parent.prototype.getActionProcess.call( this, action ); + }; + LongProcessDialog.prototype.getBodyHeight = function () { + return this.content.$element.outerHeight( true ); + }; + function FramelessProcessDialog( config ) { FramelessProcessDialog.parent.call( this, config ); } @@ -714,6 +747,13 @@ } }, { + name: 'Process dialog (medium, long)', + dialogClass: LongProcessDialog, + config: { + size: 'medium' + } + }, + { name: 'Process dialog (frameless buttons)', dialogClass: FramelessProcessDialog, config: { diff --git a/oojs/oojs-ui/demos/pages/icons.js b/oojs/oojs-ui/demos/pages/icons.js index 246c5ac..d40cb78 100644 --- a/oojs/oojs-ui/demos/pages/icons.js +++ b/oojs/oojs-ui/demos/pages/icons.js @@ -38,6 +38,7 @@ ], content: [ 'article', + 'articles', 'articleCheck', 'articleSearch', 'articleRedirect', diff --git a/oojs/oojs-ui/demos/pages/widgets.js b/oojs/oojs-ui/demos/pages/widgets.js index 2820c58..165b298 100644 --- a/oojs/oojs-ui/demos/pages/widgets.js +++ b/oojs/oojs-ui/demos/pages/widgets.js @@ -116,16 +116,14 @@ deferred = $.Deferred(), delay = 500 + Math.floor( Math.random() * 500 ); - this.isValid().done( function ( valid ) { - if ( valid ) { - // Resolve with results after a faked delay - setTimeout( function () { - deferred.resolve( [ value * 1, value * 2, value * 3, value * 4, value * 5 ] ); - }, delay ); - } else { - // No results when the input contains invalid content - deferred.resolve( [] ); - } + this.getValidity().then( function () { + // Resolve with results after a faked delay + setTimeout( function () { + deferred.resolve( [ value * 1, value * 2, value * 3, value * 4, value * 5 ] ); + }, delay ); + }, function () { + // No results when the input contains invalid content + deferred.resolve( [] ); } ); return deferred.promise( { abort: function () {} } ); diff --git a/oojs/oojs-ui/i18n/azb.json b/oojs/oojs-ui/i18n/azb.json new file mode 100644 index 0000000..313122c --- /dev/null +++ b/oojs/oojs-ui/i18n/azb.json @@ -0,0 +1,11 @@ +{ + "@metadata": { + "authors": [ + "Sadiqr" + ] + }, + "ooui-dialog-message-reject": "وازگئچ", + "ooui-dialog-process-continue": "داوام ائت", + "ooui-selectfile-button-select": "بیر فایل سئچ", + "ooui-selectfile-placeholder": "هئچ فایل سئچیلمهییب" +} diff --git a/oojs/oojs-ui/i18n/ka.json b/oojs/oojs-ui/i18n/ka.json index ddfcac2..31df169 100644 --- a/oojs/oojs-ui/i18n/ka.json +++ b/oojs/oojs-ui/i18n/ka.json @@ -17,7 +17,7 @@ "ooui-toolbar-more": "მეტი", "ooui-toolgroup-expand": "მეტი", "ooui-toolgroup-collapse": "რამდენიმე", - "ooui-dialog-message-accept": "კარგი", + "ooui-dialog-message-accept": "დიახ", "ooui-dialog-message-reject": "გაუქმება", "ooui-dialog-process-error": "მოხდა რაღაც შეცდომა", "ooui-dialog-process-dismiss": "დამალვა", diff --git a/oojs/oojs-ui/i18n/khw.json b/oojs/oojs-ui/i18n/khw.json new file mode 100644 index 0000000..f0ce207 --- /dev/null +++ b/oojs/oojs-ui/i18n/khw.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Rachitrali" + ] + }, + "ooui-toolbar-more": "مزید", + "ooui-toolgroup-expand": "مزید", + "ooui-toolgroup-collapse": "ای کما", + "ooui-dialog-message-accept": "ٹھیک شیر", + "ooui-dialog-message-reject": "کھینسل" +} diff --git a/oojs/oojs-ui/i18n/nan.json b/oojs/oojs-ui/i18n/nan.json index 7fdf532..d94118d 100644 --- a/oojs/oojs-ui/i18n/nan.json +++ b/oojs/oojs-ui/i18n/nan.json @@ -4,6 +4,12 @@ "Luuva" ] }, + "ooui-outline-control-move-down": "Hāng-bo̍k sóa ē-té", + "ooui-outline-control-move-up": "Hāng-bo̍k sóa téng-bīn", + "ooui-outline-control-remove": "Sóa cháu hāng-bo̍k", + "ooui-toolbar-more": "Khah chē", + "ooui-toolgroup-expand": "Khah chē", + "ooui-toolgroup-collapse": "Khah kiám", "ooui-dialog-message-accept": "Liáu-kái", "ooui-dialog-message-reject": "Chhú-siau", "ooui-dialog-process-error": "Ū mi̍h bô hó-sè", diff --git a/oojs/oojs-ui/i18n/zh-hant.json b/oojs/oojs-ui/i18n/zh-hant.json index f70efe1..027b7be 100644 --- a/oojs/oojs-ui/i18n/zh-hant.json +++ b/oojs/oojs-ui/i18n/zh-hant.json @@ -32,6 +32,6 @@ "ooui-dialog-process-continue": "繼續", "ooui-selectfile-button-select": "選擇一個檔案", "ooui-selectfile-not-supported": "無法支援所選擇的檔案", - "ooui-selectfile-placeholder": "未選擇檔案", + "ooui-selectfile-placeholder": "尚未選擇檔案", "ooui-selectfile-dragdrop-placeholder": "拖曳檔案到此處" } diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index 5ebbe8b..81529c1 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.16.4", + "version": "0.16.5", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", @@ -18,7 +18,7 @@ "doc": "jsduck", "postdoc": "grunt copy:jsduck", "publish-build": "grunt publish-build", - "demos": "grunt demos" + "demos": "grunt publish-build && grunt demos" }, "dependencies": { "es5-shim": "4.1.14", @@ -46,7 +46,7 @@ "grunt-jsonlint": "1.0.7", "grunt-karma": "0.12.2", "grunt-promise-q": "0.1.1", - "grunt-svg2png": "git://github.com/jdforrester/grunt-svg2png.git#2fe1dad07eaec4b655263f8b487a672df4b668b4", + "grunt-svg2png": "git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf", "grunt-tyops": "0.1.0", "grunt": "0.4.5", "karma-chrome-launcher": "0.2.2", diff --git a/oojs/oojs-ui/php/mixins/GroupElement.php b/oojs/oojs-ui/php/mixins/GroupElement.php index 93b730d..da23f73 100644 --- a/oojs/oojs-ui/php/mixins/GroupElement.php +++ b/oojs/oojs-ui/php/mixins/GroupElement.php @@ -57,7 +57,7 @@ public function addItems( array $items, $index = null ) { foreach ( $items as $item ) { // Check if item exists then remove it first, effectively "moving" it - $currentIndex = array_search( $item, $this->items ); + $currentIndex = array_search( $item, $this->items, true ); if ( $currentIndex !== false ) { $this->removeItems( [ $item ] ); // Adjust index to compensate for removal @@ -90,7 +90,7 @@ */ public function removeItems( $items ) { foreach ( $items as $item ) { - $index = array_search( $item, $this->items ); + $index = array_search( $item, $this->items, true ); if ( $index !== false ) { $item->setElementGroup( null ); array_splice( $this->items, $index, 1 ); -- To view, visit https://gerrit.wikimedia.org/r/282178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5b0dc12259ac85ff1589c0e1507238f1089da3f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
