From ee8845e329d6c7483f61f672e529b8c85a564fec Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 29 Sep 2015 14:23:51 -0700 Subject: [PATCH] Update OOjs UI to v0.12.10 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.10/History.md Change-Id: I048794c2c3e66e11762598ed97db31afc00cba0c --- composer.json | 2 +- resources/lib/oojs-ui/i18n/af.json | 8 ++- resources/lib/oojs-ui/i18n/eo.json | 1 + resources/lib/oojs-ui/i18n/ia.json | 9 +++- resources/lib/oojs-ui/i18n/ko.json | 7 ++- resources/lib/oojs-ui/i18n/ml.json | 7 ++- resources/lib/oojs-ui/i18n/olo.json | 12 ++++- resources/lib/oojs-ui/i18n/yue.json | 8 ++- .../lib/oojs-ui/oojs-ui-apex-noimages.css | 44 ++++++++-------- resources/lib/oojs-ui/oojs-ui-apex.js | 4 +- .../oojs-ui/oojs-ui-mediawiki-noimages.css | 50 +++++++++---------- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 4 +- resources/lib/oojs-ui/oojs-ui.js | 25 ++++------ 13 files changed, 102 insertions(+), 79 deletions(-) diff --git a/composer.json b/composer.json index 3809499511..3e8e1ece45 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-iconv": "*", "liuggio/statsd-php-client": "1.0.16", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.12.9", + "oojs/oojs-ui": "0.12.10", "oyejorge/less.php": "1.7.0.8", "php": ">=5.3.3", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/i18n/af.json b/resources/lib/oojs-ui/i18n/af.json index 6f79e370c9..67ec517d62 100644 --- a/resources/lib/oojs-ui/i18n/af.json +++ b/resources/lib/oojs-ui/i18n/af.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Naudefj" + "Naudefj", + "Fwolff" ] }, "ooui-outline-control-move-down": "Skuif item af", @@ -15,5 +16,8 @@ "ooui-dialog-process-error": "Iets het verkeerd gegaan", "ooui-dialog-process-dismiss": "Sluit", "ooui-dialog-process-retry": "Probeer weer", - "ooui-dialog-process-continue": "Gaan voort" + "ooui-dialog-process-continue": "Gaan voort", + "ooui-selectfile-button-select": "Kies 'n lêer", + "ooui-selectfile-placeholder": "Geen lêer is gekies nie", + "ooui-selectfile-dragdrop-placeholder": "Laat val die lêer hier" } diff --git a/resources/lib/oojs-ui/i18n/eo.json b/resources/lib/oojs-ui/i18n/eo.json index 2ead5c5b63..e78956506f 100644 --- a/resources/lib/oojs-ui/i18n/eo.json +++ b/resources/lib/oojs-ui/i18n/eo.json @@ -20,6 +20,7 @@ "ooui-dialog-process-dismiss": "Elimini", "ooui-dialog-process-retry": "Reprovi", "ooui-dialog-process-continue": "Daŭrigi", + "ooui-selectfile-button-select": "Elekti dosieron", "ooui-selectfile-not-supported": "Dosieroselekto ne estas subtenata.", "ooui-selectfile-placeholder": "Vi ne selektis dosieron" } diff --git a/resources/lib/oojs-ui/i18n/ia.json b/resources/lib/oojs-ui/i18n/ia.json index b374b6f60a..ceb27c9fd3 100644 --- a/resources/lib/oojs-ui/i18n/ia.json +++ b/resources/lib/oojs-ui/i18n/ia.json @@ -8,9 +8,16 @@ "ooui-outline-control-move-up": "Displaciar elemento in alto", "ooui-outline-control-remove": "Remover elemento", "ooui-toolbar-more": "Plus", + "ooui-toolgroup-expand": "Plus", + "ooui-toolgroup-collapse": "Minus", "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Cancellar", "ooui-dialog-process-error": "Qualcosa ha vadite mal", "ooui-dialog-process-dismiss": "Clauder", - "ooui-dialog-process-retry": "Reprobar" + "ooui-dialog-process-retry": "Reprobar", + "ooui-dialog-process-continue": "Continuar", + "ooui-selectfile-button-select": "Selige un file", + "ooui-selectfile-not-supported": "Le selection de files non es supportate", + "ooui-selectfile-placeholder": "Nulle file es seligite", + "ooui-selectfile-dragdrop-placeholder": "Depone file hic" } diff --git a/resources/lib/oojs-ui/i18n/ko.json b/resources/lib/oojs-ui/i18n/ko.json index bf47f6f9bd..38944173b3 100644 --- a/resources/lib/oojs-ui/i18n/ko.json +++ b/resources/lib/oojs-ui/i18n/ko.json @@ -9,7 +9,8 @@ "고기랑", "Ryuch", "Revi", - "Infinity" + "Infinity", + "Hwangjy9" ] }, "ooui-outline-control-move-down": "항목을 아래로 옮기기", @@ -24,6 +25,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-placeholder": "선택한 파일 없음", + "ooui-selectfile-dragdrop-placeholder": "여기에 파일을 놓으세요" } diff --git a/resources/lib/oojs-ui/i18n/ml.json b/resources/lib/oojs-ui/i18n/ml.json index 326dd14e68..9649b2eb0b 100644 --- a/resources/lib/oojs-ui/i18n/ml.json +++ b/resources/lib/oojs-ui/i18n/ml.json @@ -4,7 +4,8 @@ "Kavya Manohar", "Praveenp", "Santhosh.thottingal", - "Vssun" + "Vssun", + "Ranjithsiji" ] }, "ooui-outline-control-move-down": "ഇനം താഴേയ്ക്ക് മാറ്റുക", @@ -19,6 +20,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-placeholder": "പ്രമാണങ്ങൾ ഒന്നും തിരഞ്ഞെടുത്തിട്ടില്ല", + "ooui-selectfile-dragdrop-placeholder": "പ്രമാണം ഇവിടെ ഇടുക" } diff --git a/resources/lib/oojs-ui/i18n/olo.json b/resources/lib/oojs-ui/i18n/olo.json index 855b0eacbf..1dc994ebf1 100644 --- a/resources/lib/oojs-ui/i18n/olo.json +++ b/resources/lib/oojs-ui/i18n/olo.json @@ -4,10 +4,20 @@ "Mashoi7" ] }, + "ooui-outline-control-move-down": "Siirrä kohteh alah", + "ooui-outline-control-move-up": "Siirrä kohteh yläh", + "ooui-outline-control-remove": "Ota kohteh iäre", "ooui-toolbar-more": "Enämbi", "ooui-toolgroup-expand": "Enämbi", "ooui-toolgroup-collapse": "Vähembi", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Hylgiä", + "ooui-dialog-process-error": "Mitah haireh rodih", + "ooui-dialog-process-dismiss": "Hylgiä", "ooui-dialog-process-retry": "Opi vie", "ooui-dialog-process-continue": "Jatka", - "ooui-selectfile-button-select": "Valliče failu" + "ooui-selectfile-button-select": "Valliče failu", + "ooui-selectfile-not-supported": "Failan valličendua ei tuveta", + "ooui-selectfile-placeholder": "Failua ei ole vallittu", + "ooui-selectfile-dragdrop-placeholder": "Kirvota failu täh" } diff --git a/resources/lib/oojs-ui/i18n/yue.json b/resources/lib/oojs-ui/i18n/yue.json index 7d4e7103ae..629528ded9 100644 --- a/resources/lib/oojs-ui/i18n/yue.json +++ b/resources/lib/oojs-ui/i18n/yue.json @@ -3,7 +3,8 @@ "authors": [ "Deryck Chan", "William915", - "Shinjiman" + "Shinjiman", + "Ktchankt" ] }, "ooui-outline-control-move-down": "向下搬", @@ -11,12 +12,15 @@ "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-placeholder": "無揀到文件", + "ooui-selectfile-dragdrop-placeholder": "放檔案響度" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css index 2db4bdb598..fdfbffbedc 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.9 + * OOjs UI v0.12.10 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-09-22T20:09:59Z + * Date: 2015-09-29T21:20:47Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -1803,10 +1803,6 @@ .oo-ui-textInputWidget textarea.oo-ui-pendingElement-pending { background-color: transparent; } -.oo-ui-textInputWidget-decorated input, -.oo-ui-textInputWidget-decorated textarea { - padding-left: 2em; -} .oo-ui-textInputWidget-icon { width: 2em; } @@ -1841,15 +1837,15 @@ } .oo-ui-textInputWidget.oo-ui-iconElement input, .oo-ui-textInputWidget.oo-ui-iconElement textarea { - padding-left: 2em; + padding-left: 2.475em; } .oo-ui-textInputWidget.oo-ui-iconElement .oo-ui-iconElement-icon { width: 1.875em; - margin-left: 0.1em; + margin-left: 0.3em; } .oo-ui-textInputWidget.oo-ui-indicatorElement input, .oo-ui-textInputWidget.oo-ui-indicatorElement textarea { - padding-right: 1.5em; + padding-right: 2.4875em; } .oo-ui-textInputWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { width: 0.9375em; @@ -1861,10 +1857,10 @@ color: #888888; } .oo-ui-textInputWidget-labelPosition-after.oo-ui-indicatorElement > .oo-ui-labelElement-label { - margin-right: 1.6em; + margin-right: 2.0875em; } .oo-ui-textInputWidget-labelPosition-before.oo-ui-iconElement > .oo-ui-labelElement-label { - margin-left: 2.1em; + margin-left: 2.075em; } .oo-ui-menuSelectWidget { position: absolute; @@ -2074,7 +2070,7 @@ right: 0; } .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { - left: 0.25em; + left: 0; } .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { line-height: 2.3em; @@ -2094,20 +2090,22 @@ .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { top: 0; width: 1.875em; - height: 1.875em; - margin: 0.3em; + margin-right: 0; +} +.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { + height: 2.3em; } .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { top: 0; width: 0.9375em; - height: 0.9375em; - margin: 0.775em; + height: 2.3em; + margin-right: 0.775em; } .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { top: 0; width: 1.875em; - height: 1.875em; - margin: 0.3em; + height: 2.3em; + margin-left: 0.3em; } .oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info { color: #cccccc; @@ -2123,23 +2121,23 @@ color: #cccccc; } .oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - left: 2.75em; + left: 2.475em; } .oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 3em; + right: 2.175em; } .oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { right: 0; } .oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 5em; + right: 4.2625em; } .oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { - right: 2em; + right: 2.0875em; } .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 1em; + right: 0.5em; } .oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, .oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 5909cd118c..2e3c409abc 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.9 + * OOjs UI v0.12.10 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-09-22T20:09:51Z + * Date: 2015-09-29T21:20:38Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index f1f1831627..e4e0d36891 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.9 + * OOjs UI v0.12.10 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-09-22T20:09:59Z + * Date: 2015-09-29T21:20:47Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -1972,10 +1972,6 @@ .oo-ui-textInputWidget textarea.oo-ui-pendingElement-pending { background-color: transparent; } -.oo-ui-textInputWidget-decorated input, -.oo-ui-textInputWidget-decorated textarea { - padding-left: 2em; -} .oo-ui-textInputWidget-icon { width: 2em; } @@ -2030,18 +2026,18 @@ } .oo-ui-textInputWidget.oo-ui-iconElement input, .oo-ui-textInputWidget.oo-ui-iconElement textarea { - padding-left: 2.75em; + padding-left: 2.875em; } .oo-ui-textInputWidget.oo-ui-iconElement .oo-ui-iconElement-icon { - left: 0.4em; + left: 0; width: 1.875em; - margin-left: 0.1em; + margin-left: 0.5em; height: 100%; background-position: right center; } .oo-ui-textInputWidget.oo-ui-indicatorElement input, .oo-ui-textInputWidget.oo-ui-indicatorElement textarea { - padding-right: 1.875em; + padding-right: 2.4875em; } .oo-ui-textInputWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { width: 0.9375em; @@ -2054,10 +2050,10 @@ color: #888888; } .oo-ui-textInputWidget-labelPosition-after.oo-ui-indicatorElement > .oo-ui-labelElement-label { - margin-right: 2em; + margin-right: 2.0875em; } .oo-ui-textInputWidget-labelPosition-before.oo-ui-iconElement > .oo-ui-labelElement-label { - margin-left: 2.5em; + margin-right: 2.475em; } .oo-ui-menuSelectWidget { position: absolute; @@ -2279,7 +2275,7 @@ right: 0; } .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { - left: 0.25em; + left: 0; } .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label { line-height: 2.3em; @@ -2290,8 +2286,8 @@ -moz-box-sizing: border-box; box-sizing: border-box; text-overflow: ellipsis; - left: 1em; - right: 1em; + left: 0.5em; + right: 0.5em; } .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label > .oo-ui-selectFileWidget-fileType { color: #888888; @@ -2299,20 +2295,22 @@ .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { top: 0; width: 1.875em; - height: 1.875em; - margin: 0.3em; + margin-right: 0; +} +.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { + height: 2.3em; } .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { top: 0; width: 0.9375em; - height: 0.9375em; - margin: 0.775em; + height: 2.3em; + margin-right: 0.775em; } .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { top: 0; width: 1.875em; - height: 1.875em; - margin: 0.3em; + height: 2.3em; + margin-left: 0.5em; } .oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info { color: #cccccc; @@ -2328,23 +2326,23 @@ color: #cccccc; } .oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - left: 2.75em; + left: 2.875em; } .oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 3em; + right: 2.375em; } .oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { right: 0; } .oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 5em; + right: 4.4625em; } .oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton { - right: 2em; + right: 2.0875em; } .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { - right: 1em; + right: 0.5em; } .oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label, .oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index c2f6dc5222..4c6c77cd92 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.9 + * OOjs UI v0.12.10 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-09-22T20:09:51Z + * Date: 2015-09-29T21:20:38Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 03c2c1d8ba..1a7d406db5 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,20 +1,12 @@ -/* - * Local backports: - * - * - d190bc51e60195eed81f147e9324c9ec21c9e68c - * FloatableElement: Don't try unbinding events before we bind them - * Required for mw.widgets.DateInputWidget when used with '$overlay' config option. - */ - /*! - * OOjs UI v0.12.9 + * OOjs UI v0.12.10 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-09-22T20:09:51Z + * Date: 2015-09-29T21:20:38Z */ ( function ( OO ) { @@ -13697,7 +13689,6 @@ OO.ui.CapsuleItemWidget = function OoUiCapsuleItemWidget( config ) { keydown: this.onCloseKeyDown.bind( this ), click: this.onCloseClick.bind( this ) } ); - this.$element.on( 'click', false ); // Initialization this.$element @@ -17676,8 +17667,10 @@ OO.ui.SearchWidget.prototype.onQueryChange = function () { * @param {string} value New value */ OO.ui.SearchWidget.prototype.onQueryEnter = function () { - // Reset - this.results.chooseItem( this.results.getHighlightedItem() ); + var highlightedItem = this.results.getHighlightedItem(); + if ( highlightedItem ) { + this.results.chooseItem( highlightedItem ); + } }; /** @@ -18399,8 +18392,10 @@ OO.ui.SelectWidget.prototype.pressItem = function ( item ) { * @chainable */ OO.ui.SelectWidget.prototype.chooseItem = function ( item ) { - this.selectItem( item ); - this.emit( 'choose', item ); + if ( item ) { + this.selectItem( item ); + this.emit( 'choose', item ); + } return this; }; -- 2.20.1