jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.12.7 ......................................................................
Update OOjs UI to v0.12.7 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.7/History.md Change-Id: Iea667a717e4694e28fcfafdc7111076682cc6a4a --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/i18n/de.json A oojs/oojs-ui/i18n/en-ca.json M oojs/oojs-ui/i18n/en.json M oojs/oojs-ui/i18n/fa.json M oojs/oojs-ui/i18n/fi.json A oojs/oojs-ui/i18n/glk.json M oojs/oojs-ui/i18n/he.json M oojs/oojs-ui/i18n/mk.json M oojs/oojs-ui/i18n/nap.json M oojs/oojs-ui/i18n/pt.json M oojs/oojs-ui/i18n/qqq.json M oojs/oojs-ui/i18n/sv.json M oojs/oojs-ui/i18n/vi.json M oojs/oojs-ui/package.json 19 files changed, 179 insertions(+), 64 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index bc07826..0073abe 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "liuggio/statsd-php-client": "1.0.16", "mediawiki/at-ease": "1.0.0", "monolog/monolog": "1.14.0", - "oojs/oojs-ui": "0.12.6", + "oojs/oojs-ui": "0.12.7", "php": ">=5.3.3", "psr/log": "1.0.0", "ruflin/elastica": "2.2.0", diff --git a/composer.lock b/composer.lock index e7261de..6657198 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" ], - "hash": "0653c465457889256cda913288c80112", + "hash": "f430edec4f55e7f3c1b6d7593500d3ab", "packages": [ { "name": "composer/semver", @@ -392,16 +392,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.12.6", + "version": "v0.12.7", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa" + "reference": "e284431329b734d3bb9c945b256ad157e305348c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/f405939b8c7ef5b5759d8cff7a732deb45b1deaa";, - "reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/e284431329b734d3bb9c945b256ad157e305348c";, + "reference": "e284431329b734d3bb9c945b256ad157e305348c", "shasum": "" }, "require": { @@ -425,7 +425,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2015-08-25 23:46:32" + "time": "2015-09-01 20:24:01" }, { "name": "psr/log", diff --git a/composer/installed.json b/composer/installed.json index 1f6ebe7..cfd6feb 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -830,45 +830,6 @@ "homepage": "https://github.com/firebase/php-jwt"; }, { - "name": "oojs/oojs-ui", - "version": "v0.12.6", - "version_normalized": "0.12.6.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/f405939b8c7ef5b5759d8cff7a732deb45b1deaa";, - "reference": "f405939b8c7ef5b5759d8cff7a732deb45b1deaa", - "shasum": "" - }, - "require": { - "mediawiki/at-ease": "1.0.0", - "php": ">=5.3.3" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9", - "mediawiki/mediawiki-codesniffer": "0.3.0", - "phpunit/phpunit": "~4.5" - }, - "time": "2015-08-25 23:46:32", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "php/" - ] - }, - "notification-url": "https://packagist.org/downloads/";, - "license": [ - "MIT" - ], - "description": "Provides library of common widgets, layouts, and windows.", - "homepage": "https://www.mediawiki.org/wiki/OOjs_UI"; - }, - { "name": "wikimedia/ip-set", "version": "1.0.1", "version_normalized": "1.0.1.0", @@ -911,5 +872,44 @@ ], "description": "Efficiently match IP addresses against a set of CIDR specifications.", "homepage": "https://github.com/wikimedia/IPSet"; + }, + { + "name": "oojs/oojs-ui", + "version": "v0.12.7", + "version_normalized": "0.12.7.0", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/oojs-ui.git";, + "reference": "e284431329b734d3bb9c945b256ad157e305348c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/e284431329b734d3bb9c945b256ad157e305348c";, + "reference": "e284431329b734d3bb9c945b256ad157e305348c", + "shasum": "" + }, + "require": { + "mediawiki/at-ease": "1.0.0", + "php": ">=5.3.3" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9", + "mediawiki/mediawiki-codesniffer": "0.3.0", + "phpunit/phpunit": "~4.5" + }, + "time": "2015-09-01 20:24:01", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "php/" + ] + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "MIT" + ], + "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 d27bed7..f622662 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,5 +1,25 @@ # OOjs UI Release History +## v0.12.7 / 2015-09-01 +### Deprecations +* [DEPRECATING CHANGE] SelectFileWidget: Re-design to use a clearly clickable button (Ed Sanders) + +### Styles +* FieldLayout: Don't add `margin-bottom` when in a HorizontalLayout (Florian) +* SelectFileWidget: Use gray for hover and `@progressive-fade` for drop active (Prateek Saxena) +* Apex, MediaWiki themes: Fix scale of external link icon (Ed Sanders) +* Apex, MediaWiki themes: Re-crush all SVG files with SVGO (James D. Forrester) +* Apex, MediaWiki themes: Reduce size of 'close' icon by 1px (Ed Sanders) +* Apex, MediaWiki themes: Remove Inkscape-ism from SVG files (James D. Forrester) +* Apex, MediaWiki themes: Standardise XML prolog for SVG files (Bartosz Dziewoński) +* MediaWiki theme: Fix viewBox of arrow indicators (Ed Sanders) +* MediaWiki theme: Fix viewBox of several icons (James D. Forrester) + +### Code +* LookupElement: Really disallow editing of `readOnly` TextInputWidgets (Bartosz Dziewoński) +* SelectFileWidget: Fix drop and drop hover exception in Firefox (Ed Sanders) +* SelectFileWidget: Improve type checking (Ed Sanders) + ## v0.12.6 / 2015-08-25 ### Features * AccessKeyedElement: Introduce (Florian) diff --git a/oojs/oojs-ui/demos/pages/widgets.js b/oojs/oojs-ui/demos/pages/widgets.js index 9aa7eac..a531d7f 100644 --- a/oojs/oojs-ui/demos/pages/widgets.js +++ b/oojs/oojs-ui/demos/pages/widgets.js @@ -114,6 +114,15 @@ return items; }; + function UnsupportedSelectFileWidget() { + // Parent constructor + UnsupportedSelectFileWidget.parent.apply( this, arguments ); + } + OO.inheritClass( UnsupportedSelectFileWidget, OO.ui.SelectFileWidget ); + UnsupportedSelectFileWidget.static.isSupported = function () { + return false; + }; + capsulePopupWidget = new OO.ui.NumberInputWidget( { isInteger: true } ); @@ -952,9 +961,35 @@ } ), new OO.ui.FieldLayout( - new OO.ui.SelectFileWidget( { dragDropUI: true } ), + new UnsupportedSelectFileWidget(), { - label: 'SelectFileWidget (drag drop UI)\u200E', + label: 'SelectFileWidget (no browser support)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.SelectFileWidget( { showDropTarget: true } ), + { + label: 'SelectFileWidget (with drop target)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.SelectFileWidget( { + showDropTarget: true, + disabled: true + } ), + { + label: 'SelectFileWidget (with drop target, disabled)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new UnsupportedSelectFileWidget( { + showDropTarget: true + } ), + { + label: 'SelectFileWidget (with drop target, no browser support)\u200E', align: 'top' } ), diff --git a/oojs/oojs-ui/i18n/de.json b/oojs/oojs-ui/i18n/de.json index ee735ce..b48dfb5 100644 --- a/oojs/oojs-ui/i18n/de.json +++ b/oojs/oojs-ui/i18n/de.json @@ -25,7 +25,8 @@ "ooui-dialog-process-dismiss": "Ausblenden", "ooui-dialog-process-retry": "Erneut versuchen", "ooui-dialog-process-continue": "Fortfahren", + "ooui-selectfile-button-select": "Eine Datei auswählen", "ooui-selectfile-not-supported": "Die Dateiauswahl wird nicht unterstützt", "ooui-selectfile-placeholder": "Keine Datei ausgewählt", - "ooui-selectfile-dragdrop-placeholder": "Dateien hier ablegen (oder klicken zum Durchsuchen)" + "ooui-selectfile-dragdrop-placeholder": "Dateien hier ablegen" } diff --git a/oojs/oojs-ui/i18n/en-ca.json b/oojs/oojs-ui/i18n/en-ca.json new file mode 100644 index 0000000..218ece2 --- /dev/null +++ b/oojs/oojs-ui/i18n/en-ca.json @@ -0,0 +1,23 @@ +{ + "@metadata": { + "authors": [ + "Skyllful" + ] + }, + "ooui-outline-control-move-down": "Move item down", + "ooui-outline-control-move-up": "Move item up", + "ooui-outline-control-remove": "Remove item", + "ooui-toolbar-more": "More", + "ooui-toolgroup-expand": "More", + "ooui-toolgroup-collapse": "Less", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Cancel", + "ooui-dialog-process-error": "Something went wrong", + "ooui-dialog-process-dismiss": "Dismiss", + "ooui-dialog-process-retry": "Try again", + "ooui-dialog-process-continue": "Continue", + "ooui-selectfile-not-supported": "File(s) not supported", + "ooui-selectfile-placeholder": "No file selected", + "ooui-selectfile-dragdrop-placeholder": "Drop file here (or click to browse your computer)", + "ooui-semicolon-separator": ";" +} diff --git a/oojs/oojs-ui/i18n/en.json b/oojs/oojs-ui/i18n/en.json index db2399f..7cf2eb1 100644 --- a/oojs/oojs-ui/i18n/en.json +++ b/oojs/oojs-ui/i18n/en.json @@ -28,8 +28,9 @@ "ooui-dialog-process-dismiss": "Dismiss", "ooui-dialog-process-retry": "Try again", "ooui-dialog-process-continue": "Continue", + "ooui-selectfile-button-select": "Select a file", "ooui-selectfile-not-supported": "File selection is not supported", "ooui-selectfile-placeholder": "No file is selected", - "ooui-selectfile-dragdrop-placeholder": "Drop file here (or click to browse)", + "ooui-selectfile-dragdrop-placeholder": "Drop file here", "ooui-semicolon-separator": "; " } diff --git a/oojs/oojs-ui/i18n/fa.json b/oojs/oojs-ui/i18n/fa.json index e20997a..11bd4b8 100644 --- a/oojs/oojs-ui/i18n/fa.json +++ b/oojs/oojs-ui/i18n/fa.json @@ -13,7 +13,8 @@ "Armin1392", "Alirezaaa", "Leyth", - "الناز" + "الناز", + "فلورانس" ] }, "ooui-outline-control-move-down": "انتقال مورد به پایین", @@ -29,5 +30,6 @@ "ooui-dialog-process-retry": "دوباره امتحان کنید", "ooui-dialog-process-continue": "ادامه", "ooui-selectfile-not-supported": "انتخاب پرونده پشتیبانی نمیشود", - "ooui-selectfile-placeholder": "هیچ پروندهای انتخاب نشده است" + "ooui-selectfile-placeholder": "هیچ پروندهای انتخاب نشده است", + "ooui-selectfile-dragdrop-placeholder": "رها کردن فایل در اینجا (و یا کلیک کنید به فهرست)" } diff --git a/oojs/oojs-ui/i18n/fi.json b/oojs/oojs-ui/i18n/fi.json index c96a74e..bdf015f 100644 --- a/oojs/oojs-ui/i18n/fi.json +++ b/oojs/oojs-ui/i18n/fi.json @@ -30,5 +30,6 @@ "ooui-dialog-process-retry": "Yritä uudelleen", "ooui-dialog-process-continue": "Jatka", "ooui-selectfile-not-supported": "Tiedoston valitsemista ei tueta", - "ooui-selectfile-placeholder": "Tiedostoa ei ole valittu" + "ooui-selectfile-placeholder": "Tiedostoa ei ole valittu", + "ooui-selectfile-dragdrop-placeholder": "Pudota tiedosto (tai selaa tiedostoja napsauttamalla)" } diff --git a/oojs/oojs-ui/i18n/glk.json b/oojs/oojs-ui/i18n/glk.json new file mode 100644 index 0000000..9b15046 --- /dev/null +++ b/oojs/oojs-ui/i18n/glk.json @@ -0,0 +1,23 @@ +{ + "@metadata": { + "authors": [ + "V6rg" + ] + }, + "ooui-outline-control-move-down": "مأسمکه جابجا بۊکۊن جير", + "ooui-outline-control-move-up": "مأسمکه جابجا بۊکۊن جؤر", + "ooui-outline-control-remove": "مأسمکه حذفأکۊن", + "ooui-toolbar-more": "ويشتر", + "ooui-toolgroup-expand": "ويشتر", + "ooui-toolgroup-collapse": "کمتر", + "ooui-dialog-message-accept": "خؤ", + "ooui-dialog-message-reject": "لغو", + "ooui-dialog-process-error": "ىک مؤشکلي هنأ", + "ooui-dialog-process-dismiss": "وأبدي", + "ooui-dialog-process-retry": "هنده حقسأى بۊکۊنين", + "ooui-dialog-process-continue": "سره", + "ooui-selectfile-button-select": "ىکته فاىله دؤجين بۊکۊنين", + "ooui-selectfile-not-supported": "نشأنهىکته فاىله دؤجين گۊدن", + "ooui-selectfile-placeholder": "هيچ فاىلي دؤجين نۊبؤ", + "ooui-selectfile-dragdrop-placeholder": "فاىله ائره فدي" +} diff --git a/oojs/oojs-ui/i18n/he.json b/oojs/oojs-ui/i18n/he.json index b652d63..650d67d 100644 --- a/oojs/oojs-ui/i18n/he.json +++ b/oojs/oojs-ui/i18n/he.json @@ -27,7 +27,8 @@ "ooui-dialog-process-dismiss": "לוותר", "ooui-dialog-process-retry": "לנסות שוב", "ooui-dialog-process-continue": "המשך", + "ooui-selectfile-button-select": "נא לבחור קובץ", "ooui-selectfile-not-supported": "בחירת קבצים אינה נתמכת", "ooui-selectfile-placeholder": "לא נבחר שום קובץ", - "ooui-selectfile-dragdrop-placeholder": "נא לשחרר את הקובץ כאן (או ללחוץ לעיון)" + "ooui-selectfile-dragdrop-placeholder": "נא לשחרר את הקובץ כאן" } diff --git a/oojs/oojs-ui/i18n/mk.json b/oojs/oojs-ui/i18n/mk.json index dd55db4..46f37fe 100644 --- a/oojs/oojs-ui/i18n/mk.json +++ b/oojs/oojs-ui/i18n/mk.json @@ -18,7 +18,8 @@ "ooui-dialog-process-dismiss": "Тргни", "ooui-dialog-process-retry": "Обиди се пак", "ooui-dialog-process-continue": "Продолжи", + "ooui-selectfile-button-select": "Одберете податотека", "ooui-selectfile-not-supported": "Изборот на податотеки не е поддржан", "ooui-selectfile-placeholder": "Немате одбрано податотека", - "ooui-selectfile-dragdrop-placeholder": "Тука пуштете ја податотеката (или стиснете за да прелистате)" + "ooui-selectfile-dragdrop-placeholder": "Тука пуштете ја податотеката" } diff --git a/oojs/oojs-ui/i18n/nap.json b/oojs/oojs-ui/i18n/nap.json index 9c07f41..b7e37b4 100644 --- a/oojs/oojs-ui/i18n/nap.json +++ b/oojs/oojs-ui/i18n/nap.json @@ -4,7 +4,8 @@ "Chelin", "Chrisportelli", "PiRSquared17", - "C.R." + "C.R.", + "Candalua" ] }, "ooui-outline-control-move-down": "Mòve abbascio", @@ -19,6 +20,8 @@ "ooui-dialog-process-dismiss": "Passa 'a vacca", "ooui-dialog-process-retry": "Prova n'ata vota", "ooui-dialog-process-continue": "Continua", + "ooui-selectfile-button-select": "Sceglie nu file", "ooui-selectfile-not-supported": "Filtro 'e selezione nun suppurtato", - "ooui-selectfile-placeholder": "Nun s'è scigliuto nisciuno file" + "ooui-selectfile-placeholder": "Nun s'è scigliuto nisciuno file", + "ooui-selectfile-dragdrop-placeholder": "Lassa 'o file ccà" } diff --git a/oojs/oojs-ui/i18n/pt.json b/oojs/oojs-ui/i18n/pt.json index aab0aed..8379cac 100644 --- a/oojs/oojs-ui/i18n/pt.json +++ b/oojs/oojs-ui/i18n/pt.json @@ -26,5 +26,6 @@ "ooui-dialog-process-retry": "Tentar novamente", "ooui-dialog-process-continue": "Continuar", "ooui-selectfile-not-supported": "A seleção de ficheiros não é suportada", - "ooui-selectfile-placeholder": "Nenhum ficheiro selecionado" + "ooui-selectfile-placeholder": "Nenhum ficheiro selecionado", + "ooui-selectfile-dragdrop-placeholder": "Soltar ficheiro aqui (ou clicar para navegar)" } diff --git a/oojs/oojs-ui/i18n/qqq.json b/oojs/oojs-ui/i18n/qqq.json index 607229d..cd9c0c2 100644 --- a/oojs/oojs-ui/i18n/qqq.json +++ b/oojs/oojs-ui/i18n/qqq.json @@ -32,8 +32,9 @@ "ooui-dialog-process-dismiss": "Label for process dialog dismiss error button, visible when describing errors\n{{Identical|Dismiss}}", "ooui-dialog-process-retry": "Label for process dialog retry action button, visible when describing recoverable errors\n{{Identical|Try again}}", "ooui-dialog-process-continue": "Label for process dialog retry action button, visible when describing only warnings\n{{Identical|Continue}}", - "ooui-selectfile-not-supported": "Label for the file selection dialog if file selection is not supported", - "ooui-selectfile-placeholder": "Label for the file selection dialog when no file is currently selected", - "ooui-selectfile-dragdrop-placeholder": "Label for the file selection dialog when no file is currently selected in the drag drop UI. Suggests clicking to open the browse dialog.", + "ooui-selectfile-button-select": "Label for the file selection widget's select file button", + "ooui-selectfile-not-supported": "Label for the file selection widget if file selection is not supported", + "ooui-selectfile-placeholder": "Label for the file selection widget when no file is currently selected", + "ooui-selectfile-dragdrop-placeholder": "Label for the file selection widget's drop target", "ooui-semicolon-separator": "{{optional}} Semicolon used as a separator" } diff --git a/oojs/oojs-ui/i18n/sv.json b/oojs/oojs-ui/i18n/sv.json index 9cd8ea3..41c2646 100644 --- a/oojs/oojs-ui/i18n/sv.json +++ b/oojs/oojs-ui/i18n/sv.json @@ -28,5 +28,6 @@ "ooui-dialog-process-retry": "Försök igen", "ooui-dialog-process-continue": "Fortsätt", "ooui-selectfile-not-supported": "Filval stöds inte", - "ooui-selectfile-placeholder": "Ingen fil är vald" + "ooui-selectfile-placeholder": "Ingen fil är vald", + "ooui-selectfile-dragdrop-placeholder": "Släpp filen här (eller klicka för att bläddra)" } diff --git a/oojs/oojs-ui/i18n/vi.json b/oojs/oojs-ui/i18n/vi.json index 7d4252d..ff14801 100644 --- a/oojs/oojs-ui/i18n/vi.json +++ b/oojs/oojs-ui/i18n/vi.json @@ -21,5 +21,6 @@ "ooui-dialog-process-retry": "Thử lại", "ooui-dialog-process-continue": "Tiếp tục", "ooui-selectfile-not-supported": "Không hỗ trợ việc chọn tập tin", - "ooui-selectfile-placeholder": "Không có tập tin nào được chọn" + "ooui-selectfile-placeholder": "Không có tập tin nào được chọn", + "ooui-selectfile-dragdrop-placeholder": "Thả tập tin vào đây (hoặc nhấn chuột để duyệt)" } diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index 92669db..5faa2a6 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.12.6", + "version": "0.12.7", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/235380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea667a717e4694e28fcfafdc7111076682cc6a4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[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
