From: James D. Forrester Date: Tue, 28 Jul 2015 23:19:36 +0000 (-0700) Subject: Update OOjs UI to v0.12.2 X-Git-Tag: 1.31.0-rc.0~10600 X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=e1075f5e8e4c85d0459b27edc001e99b5b9541ec;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.12.2 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.2/History.md Change-Id: Ic7f4be9eee8c17e00270de8b731ec6206a35f9ad --- diff --git a/composer.json b/composer.json index 88ebdd5fd0..3d8707d221 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "leafo/lessphp": "0.5.0", "liuggio/statsd-php-client": "1.0.16", "mediawiki/at-ease": "1.0.0", - "oojs/oojs-ui": "0.12.1", + "oojs/oojs-ui": "0.12.2", "php": ">=5.3.3", "psr/log": "1.0.0", "wikimedia/cdb": "1.0.1", diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php index 974db87ea2..8c3d091008 100644 --- a/resources/ResourcesOOUI.php +++ b/resources/ResourcesOOUI.php @@ -86,6 +86,7 @@ return call_user_func( function () { 'icons', // oojs-ui.styles.icons 'indicators', // oojs-ui.styles.indicators 'textures', // oojs-ui.styles.textures + 'icons-accessibility', // oojs-ui.styles.icons-accessibility 'icons-alerts', // oojs-ui.styles.icons-alerts 'icons-content', // oojs-ui.styles.icons-content 'icons-editing-advanced', // oojs-ui.styles.icons-editing-advanced @@ -113,7 +114,7 @@ return call_user_func( function () { if ( substr( $name, 0, 5 ) === 'icons' ) { $module['selectorWithoutVariant'] = '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before'; - $module['selectorWithVariant'] = '.oo-ui-image-{variant} .oo-ui-icon-{name}, + $module['selectorWithVariant'] = '.oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before, .mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before, .mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before'; diff --git a/resources/lib/oojs-ui/i18n/vi.json b/resources/lib/oojs-ui/i18n/vi.json index d62e3cb0dd..7d4252def1 100644 --- a/resources/lib/oojs-ui/i18n/vi.json +++ b/resources/lib/oojs-ui/i18n/vi.json @@ -20,6 +20,6 @@ "ooui-dialog-process-dismiss": "Bỏ qua", "ooui-dialog-process-retry": "Thử lại", "ooui-dialog-process-continue": "Tiếp tục", - "ooui-selectfile-not-supported": "Tệp tin được chọn không được hỗ trợ", - "ooui-selectfile-placeholder": "Không có Tệp tin nào được chọn" + "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" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css index d9a8314002..3557c4c9ff 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.1 + * OOjs UI v0.12.2 * 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-07-22T19:37:14Z + * Date: 2015-07-28T23:01:40Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -2354,6 +2354,9 @@ /* @noflip */ left: 0; } +.oo-ui-dialog { + z-index: 1000; +} .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, .oo-ui-dialog-content > .oo-ui-window-foot { diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index f5d2ea7b2c..690634713e 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.1 + * OOjs UI v0.12.2 * 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-07-22T19:37:07Z + * Date: 2015-07-28T23:01:32Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index d5392199fd..d686ad9231 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.1 + * OOjs UI v0.12.2 * 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-07-22T19:37:14Z + * Date: 2015-07-28T23:01:40Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -2528,6 +2528,9 @@ /* @noflip */ left: 0; } +.oo-ui-dialog { + z-index: 1000; +} .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, .oo-ui-dialog-content > .oo-ui-window-foot { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index b73f751197..f226800eb5 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.1 + * OOjs UI v0.12.2 * 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-07-22T19:37:07Z + * Date: 2015-07-28T23:01:32Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 96c32042d6..ed239a6e3e 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.1 + * OOjs UI v0.12.2 * 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-07-22T19:37:07Z + * Date: 2015-07-28T23:01:32Z */ ( function ( OO ) { @@ -16109,7 +16109,7 @@ OO.ui.SearchWidget.prototype.getResults = function () { * @abstract * @class * @extends OO.ui.Widget - * @mixins OO.ui.mixin.GroupElement + * @mixins OO.ui.mixin.GroupWidget * * @constructor * @param {Object} [config] Configuration options diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-accessibility.json b/resources/lib/oojs-ui/themes/mediawiki/icons-accessibility.json new file mode 100644 index 0000000000..ee1d0a5c20 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-accessibility.json @@ -0,0 +1,19 @@ +{ + "prefix": "oo-ui-icon", + "intro": "@import '../../../../src/styles/common';", + "images": { + "bright": { "file": "images/icons/bright.svg" }, + "halfBright": { "file": "images/icons/halfBright.svg" }, + "notBright": { "file": "images/icons/notBright.svg" }, + "moon": { "file": "images/icons/moon.svg" }, + "largerText": { "file": { + "ltr": "images/icons/largerText-ltr.svg", + "rtl": "images/icons/largerText-rtl.svg" + } }, + "smallerText": { "file": { + "ltr": "images/icons/smallerText-ltr.svg", + "rtl": "images/icons/smallerText-rtl.svg" + } }, + "visionSimulator": { "file": "images/icons/visionSimulator.svg" } + } +} diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json b/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json index ae6b09d75c..c507284774 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json @@ -37,7 +37,6 @@ "viewDetails": { "file": { "ltr": "images/icons/viewDetails-ltr.svg", "rtl": "images/icons/viewDetails-rtl.svg" - } }, - "visionSimulator": { "file": "images/icons/visionSimulator.svg" } + } } } } diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.png new file mode 100644 index 0000000000..3e9e2f1a24 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.svg new file mode 100644 index 0000000000..576e89d560 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.png new file mode 100644 index 0000000000..9332beae12 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.svg new file mode 100644 index 0000000000..b97eae3529 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.png new file mode 100644 index 0000000000..79a28248d6 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.svg new file mode 100644 index 0000000000..99d6f0170c --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.png new file mode 100644 index 0000000000..79a28248d6 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.svg new file mode 100644 index 0000000000..99d6f0170c --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.png new file mode 100644 index 0000000000..98df69c46e Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.svg new file mode 100644 index 0000000000..55e5ac7569 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.png new file mode 100644 index 0000000000..37145c76fa Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.svg new file mode 100644 index 0000000000..04139daadf --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.png new file mode 100644 index 0000000000..63551b4446 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.svg new file mode 100644 index 0000000000..fb025f3eaa --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.png new file mode 100644 index 0000000000..a245556eb8 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.svg new file mode 100644 index 0000000000..bd995db670 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/visionSimulator-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/visionSimulator-invert.png deleted file mode 100644 index 118e4687c2..0000000000 Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/visionSimulator-invert.png and /dev/null differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/visionSimulator-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/visionSimulator-invert.svg deleted file mode 100644 index ae0d94e200..0000000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/visionSimulator-invert.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -