From f77036a73ad8207ed0fe26869f5d0e868accaedc Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 12 Jul 2016 13:30:06 -0700 Subject: [PATCH] Update OOjs UI to v0.17.6 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.6 Change-Id: I82b26aa68c7402346c449cafb3f6ec9b772bc5c6 --- composer.json | 2 +- resources/lib/oojs-ui/oojs-ui-apex.js | 13 ++++- resources/lib/oojs-ui/oojs-ui-core-apex.css | 13 +++-- .../lib/oojs-ui/oojs-ui-core-mediawiki.css | 53 ++++++++++++------ resources/lib/oojs-ui/oojs-ui-core.js | 27 ++++++--- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 11 +++- .../lib/oojs-ui/oojs-ui-toolbars-apex.css | 6 +- .../oojs-ui/oojs-ui-toolbars-mediawiki.css | 16 +++--- resources/lib/oojs-ui/oojs-ui-toolbars.js | 38 +++++++------ .../lib/oojs-ui/oojs-ui-widgets-apex.css | 4 +- .../lib/oojs-ui/oojs-ui-widgets-mediawiki.css | 10 ++-- resources/lib/oojs-ui/oojs-ui-widgets.js | 32 ++++++++--- .../lib/oojs-ui/oojs-ui-windows-apex.css | 4 +- .../lib/oojs-ui/oojs-ui-windows-mediawiki.css | 12 ++-- resources/lib/oojs-ui/oojs-ui-windows.js | 25 ++++++--- .../themes/apex/images/icons/flag-rtl.png | Bin 219 -> 246 bytes .../themes/apex/images/icons/flag-rtl.svg | 4 +- .../themes/apex/images/icons/flagUndo-ltr.png | Bin 229 -> 271 bytes .../themes/apex/images/icons/flagUndo-ltr.svg | 4 +- .../themes/apex/images/icons/flagUndo-rtl.png | Bin 272 -> 313 bytes .../themes/apex/images/icons/flagUndo-rtl.svg | 4 +- .../images/icons/flag-rtl-invert.png | Bin 239 -> 258 bytes .../images/icons/flag-rtl-invert.svg | 4 +- .../mediawiki/images/icons/flag-rtl.png | Bin 219 -> 246 bytes .../mediawiki/images/icons/flag-rtl.svg | 4 +- .../images/icons/flagUndo-ltr-invert.png | Bin 232 -> 286 bytes .../images/icons/flagUndo-ltr-invert.svg | 4 +- .../mediawiki/images/icons/flagUndo-ltr.png | Bin 229 -> 271 bytes .../mediawiki/images/icons/flagUndo-ltr.svg | 4 +- .../images/icons/flagUndo-rtl-invert.png | Bin 257 -> 335 bytes .../images/icons/flagUndo-rtl-invert.svg | 4 +- .../mediawiki/images/icons/flagUndo-rtl.png | Bin 272 -> 313 bytes .../mediawiki/images/icons/flagUndo-rtl.svg | 4 +- .../mediawiki/images/icons/stop-invert.png | Bin 317 -> 279 bytes .../mediawiki/images/icons/stop-invert.svg | 2 +- .../themes/mediawiki/images/icons/stop.png | Bin 317 -> 273 bytes .../themes/mediawiki/images/icons/stop.svg | 2 +- 37 files changed, 190 insertions(+), 116 deletions(-) diff --git a/composer.json b/composer.json index 63b5c5c111..d5bf93c7ba 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-xml": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.17.5", + "oojs/oojs-ui": "0.17.6", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 026bbb3af9..a34432f35e 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.17.5 + * OOjs UI v0.17.6 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-06-29T13:27:08Z + * Date: 2016-07-12T20:26:03Z */ ( function ( OO ) { @@ -27,6 +27,15 @@ OO.ui.ApexTheme = function OoUiApexTheme() { OO.inheritClass( OO.ui.ApexTheme, OO.ui.Theme ); +/* Methods */ + +/** + * @inheritdoc + */ +OO.ui.ApexTheme.prototype.getDialogTransitionDuration = function () { + return 250; +}; + /* Instantiation */ OO.ui.theme = new OO.ui.ApexTheme(); diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css index fa5ec0af4c..152d444fb5 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.5 + * OOjs UI v0.17.6 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-06-29T13:27:11Z + * Date: 2016-07-12T20:26:07Z */ .oo-ui-element-hidden { display: none !important; @@ -31,6 +31,11 @@ .oo-ui-buttonElement.oo-ui-widget-disabled > .oo-ui-buttonElement-button { cursor: default; } +.oo-ui-buttonElement.oo-ui-widget-enabled > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active, +.oo-ui-buttonElement.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { + z-index: 2; +} .oo-ui-buttonElement.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator, .oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, .oo-ui-buttonElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { @@ -303,7 +308,7 @@ } .oo-ui-fieldLayout > .oo-ui-fieldLayout-help .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; - line-height: 1.5em; + line-height: 1.5; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -395,7 +400,7 @@ } .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help .oo-ui-fieldsetLayout-help-content { padding: 0.5em 0.75em; - line-height: 1.5em; + line-height: 1.5; } .oo-ui-fieldsetLayout + .oo-ui-fieldsetLayout, .oo-ui-fieldsetLayout + .oo-ui-formLayout { diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index 03380b2468..a191804687 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.5 + * OOjs UI v0.17.6 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-06-29T13:27:11Z + * Date: 2016-07-12T20:26:07Z */ .oo-ui-element-hidden { display: none !important; @@ -31,6 +31,11 @@ .oo-ui-buttonElement.oo-ui-widget-disabled > .oo-ui-buttonElement-button { cursor: default; } +.oo-ui-buttonElement.oo-ui-widget-enabled > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active, +.oo-ui-buttonElement.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { + z-index: 2; +} .oo-ui-buttonElement.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator, .oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, .oo-ui-buttonElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { @@ -49,6 +54,7 @@ text-decoration: none; } .oo-ui-buttonElement > .oo-ui-buttonElement-button:focus { + border-radius: 2px; outline: 0; } .oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { @@ -135,7 +141,7 @@ } .oo-ui-buttonElement-framed > input.oo-ui-buttonElement-button, .oo-ui-buttonElement-framed.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - line-height: 1.2em; + line-height: 1.2; } .oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { position: absolute; @@ -394,7 +400,7 @@ } .oo-ui-fieldLayout > .oo-ui-fieldLayout-help .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; - line-height: 1.5em; + line-height: 1.5; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -445,7 +451,7 @@ .oo-ui-fieldLayout-messages .oo-ui-labelWidget { display: table-cell; padding: 0; - line-height: 1.875em; + line-height: 1.875; vertical-align: middle; } .oo-ui-actionFieldLayout { @@ -484,7 +490,7 @@ } .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help .oo-ui-fieldsetLayout-help-content { padding: 0.5em 0.75em; - line-height: 1.5em; + line-height: 1.5; } .oo-ui-fieldsetLayout + .oo-ui-fieldsetLayout, .oo-ui-fieldsetLayout + .oo-ui-formLayout { @@ -498,7 +504,7 @@ } .oo-ui-fieldsetLayout.oo-ui-iconElement > .oo-ui-labelElement-label { padding-left: 2em; - line-height: 1.8em; + line-height: 1.8; } .oo-ui-fieldsetLayout.oo-ui-iconElement > .oo-ui-iconElement-icon { left: 0; @@ -578,7 +584,7 @@ background-color: #eeeeee; } .oo-ui-optionWidget .oo-ui-labelElement-label { - line-height: 1.5em; + line-height: 1.5; } .oo-ui-selectWidget-depressed .oo-ui-optionWidget-selected, .oo-ui-selectWidget-pressed .oo-ui-optionWidget-pressed, @@ -644,7 +650,7 @@ .oo-ui-iconWidget { display: inline-block; vertical-align: middle; - line-height: 2.5em; + line-height: 2.5; } .oo-ui-iconWidget.oo-ui-widget-disabled { opacity: 0.2; @@ -652,7 +658,7 @@ .oo-ui-indicatorWidget { display: inline-block; vertical-align: middle; - line-height: 2.5em; + line-height: 2.5; margin: 0.46875em; } .oo-ui-indicatorWidget.oo-ui-widget-disabled { @@ -685,9 +691,6 @@ border-radius: 0; margin-left: -1px; } -.oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button:focus { - z-index: 2; -} .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { border-bottom-left-radius: 2px; border-top-left-radius: 2px; @@ -892,7 +895,7 @@ padding: 0.25em 0; } .oo-ui-checkboxMultiselectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body .oo-ui-labelElement-label { - line-height: 1.5em; + line-height: 1.5; } .oo-ui-dropdownInputWidget { position: relative; @@ -1019,7 +1022,7 @@ padding: 0.25em 0; } .oo-ui-radioSelectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body .oo-ui-labelElement-label { - line-height: 1.5em; + line-height: 1.5; } .oo-ui-textInputWidget { position: relative; @@ -1103,7 +1106,7 @@ border-radius: 2px; } .oo-ui-textInputWidget textarea { - line-height: 1.275em; + line-height: 1.275; } .oo-ui-textInputWidget .oo-ui-pendingElement-pending { background-color: transparent; @@ -1131,6 +1134,20 @@ border-color: #cccccc; box-shadow: inset 0 0 0 0.1em #cccccc; } +.oo-ui-textInputWidget.oo-ui-widget-enabled :-moz-placeholder { + color: #595959; + opacity: 1; +} +.oo-ui-textInputWidget.oo-ui-widget-enabled ::-moz-placeholder { + color: #595959; + opacity: 1; +} +.oo-ui-textInputWidget.oo-ui-widget-enabled :-ms-input-placeholder { + color: #595959; +} +.oo-ui-textInputWidget.oo-ui-widget-enabled ::-webkit-input-placeholder { + color: #595959; +} .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid input, .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid textarea { border-color: #ff0000; @@ -1177,7 +1194,7 @@ } .oo-ui-textInputWidget > .oo-ui-labelElement-label { padding: 0.4em; - line-height: 1.5em; + line-height: 1.5; color: #888888; } .oo-ui-textInputWidget-labelPosition-after.oo-ui-indicatorElement > .oo-ui-labelElement-label { @@ -1362,7 +1379,7 @@ overflow: hidden; } .oo-ui-multioptionWidget .oo-ui-labelElement-label { - line-height: 1.5em; + line-height: 1.5; } .oo-ui-multioptionWidget.oo-ui-widget-disabled { color: #cccccc; diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index e230a49aca..2a1427b33f 100644 --- a/resources/lib/oojs-ui/oojs-ui-core.js +++ b/resources/lib/oojs-ui/oojs-ui-core.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.5 + * OOjs UI v0.17.6 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-06-29T13:27:08Z + * Date: 2016-07-12T20:26:03Z */ ( function ( OO ) { @@ -1634,6 +1634,18 @@ OO.ui.Theme.prototype.updateElementClasses = function ( element ) { .addClass( classes.on.join( ' ' ) ); }; +/** + * Get the transition duration in milliseconds for dialogs opening/closing + * + * The dialog should be fully rendered this many milliseconds after the + * ready process has executed. + * + * @return {number} Transition duration in milliseconds + */ +OO.ui.Theme.prototype.getDialogTransitionDuration = function () { + return 0; +}; + /** * The TabIndexedElement class is an attribute mixin used to add additional functionality to an * element created by another class. The mixin provides a ‘tabIndex’ property, which specifies the @@ -3727,6 +3739,7 @@ OO.ui.IndicatorWidget.static.tagName = 'span'; * @class * @extends OO.ui.Widget * @mixins OO.ui.mixin.LabelElement + * @mixins OO.ui.mixin.TitledElement * * @constructor * @param {Object} [config] Configuration options @@ -7580,7 +7593,7 @@ OO.ui.InputWidget.prototype.restorePreInfuseState = function ( state ) { * ButtonInputWidget is used to submit HTML forms and is intended to be used within * a OO.ui.FormLayout. If you do not need the button to work with HTML forms, you probably * want to use OO.ui.ButtonWidget instead. Button input widgets can be rendered as either an - * HTML `