From 505cc11af40e2418b350653356b32f87ff280e0c Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 10 May 2016 16:06:27 -0700 Subject: [PATCH] Update OOjs UI to v0.17.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.2 Change-Id: I8e8101e3284c69f8fa6edf142f4cf84efff65e09 --- composer.json | 2 +- resources/lib/oojs-ui/oojs-ui-apex.js | 4 ++-- resources/lib/oojs-ui/oojs-ui-core-apex.css | 8 +++---- .../lib/oojs-ui/oojs-ui-core-mediawiki.css | 19 ++++++--------- resources/lib/oojs-ui/oojs-ui-core.js | 24 +++++++++++++++---- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 4 ++-- .../lib/oojs-ui/oojs-ui-toolbars-apex.css | 4 ++-- .../oojs-ui/oojs-ui-toolbars-mediawiki.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-toolbars.js | 4 ++-- .../lib/oojs-ui/oojs-ui-widgets-apex.css | 4 ++-- .../lib/oojs-ui/oojs-ui-widgets-mediawiki.css | 9 +++---- resources/lib/oojs-ui/oojs-ui-widgets.js | 4 ++-- .../lib/oojs-ui/oojs-ui-windows-apex.css | 4 ++-- .../lib/oojs-ui/oojs-ui-windows-mediawiki.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-windows.js | 4 ++-- 15 files changed, 55 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index b614a4c1b0..ef85ec4652 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.1", + "oojs/oojs-ui": "0.17.2", "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 625c02edb1..9a8b058dfe 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.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:02Z + * Date: 2016-05-10T22:58:27Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css index eeb4b286d8..9ec7278847 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.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-element-hidden { display: none !important; @@ -801,9 +801,7 @@ display: none; } .oo-ui-textInputWidget [type="search"]::-webkit-search-decoration, -.oo-ui-textInputWidget [type="search"]::-webkit-search-cancel-button, -.oo-ui-textInputWidget [type="search"]::-webkit-search-results-button, -.oo-ui-textInputWidget [type="search"]::-webkit-search-results-decoration { +.oo-ui-textInputWidget [type="search"]::-webkit-search-cancel-button { display: none; } .oo-ui-textInputWidget > .oo-ui-iconElement-icon, diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index 268a6802ba..ba293e4399 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.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-element-hidden { display: none !important; @@ -62,9 +62,6 @@ .oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { margin-left: 0.46875em; } -.oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button:focus { - box-shadow: inset 0 0 0 1px #347bff, 0 0 0 1px #347bff; -} .oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button .oo-ui-indicatorElement-indicator { margin-right: 0; } @@ -77,6 +74,9 @@ padding-right: 0.25em; color: #333333; } +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { + box-shadow: inset 0 0 0 1px #347bff, 0 0 0 1px #347bff; +} .oo-ui-buttonElement-frameless.oo-ui-widget-enabled > input.oo-ui-buttonElement-button, .oo-ui-buttonElement-frameless.oo-ui-widget-enabled > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { color: #555555; @@ -121,9 +121,6 @@ .oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button { color: #cccccc; } -.oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button:focus { - box-shadow: none; -} .oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, .oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { opacity: 0.2; @@ -1046,9 +1043,7 @@ display: none; } .oo-ui-textInputWidget [type="search"]::-webkit-search-decoration, -.oo-ui-textInputWidget [type="search"]::-webkit-search-cancel-button, -.oo-ui-textInputWidget [type="search"]::-webkit-search-results-button, -.oo-ui-textInputWidget [type="search"]::-webkit-search-results-decoration { +.oo-ui-textInputWidget [type="search"]::-webkit-search-cancel-button { display: none; } .oo-ui-textInputWidget > .oo-ui-iconElement-icon, @@ -1119,7 +1114,7 @@ .oo-ui-textInputWidget.oo-ui-widget-enabled textarea:focus { outline: 0; border-color: #347bff; - box-shadow: inset 0 0 0 0.1em #347bff; + box-shadow: inset 0 0 0 1px #347bff; } .oo-ui-textInputWidget.oo-ui-widget-enabled input[readonly], .oo-ui-textInputWidget.oo-ui-widget-enabled textarea[readonly] { diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index ddfee91c4c..cbc02eb44d 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.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:02Z + * Date: 2016-05-10T22:58:27Z */ ( function ( OO ) { @@ -2001,10 +2001,13 @@ OO.ui.mixin.ButtonElement.prototype.toggleFramed = function ( framed ) { /** * Set the button's active state. * - * The active state occurs when a {@link OO.ui.ButtonOptionWidget ButtonOptionWidget} or - * a {@link OO.ui.ToggleButtonWidget ToggleButtonWidget} is pressed. This method does nothing - * for other button types. + * The active state can be set on: * + * - {@link OO.ui.ButtonOptionWidget ButtonOptionWidget} when it is selected + * - {@link OO.ui.ToggleButtonWidget ToggleButtonWidget} when it is toggle on + * - {@link OO.ui.ButtonWidget ButtonWidget} when clicking the button would only refresh the page + * + * @protected * @param {boolean} value Make button active * @chainable */ @@ -2017,6 +2020,7 @@ OO.ui.mixin.ButtonElement.prototype.setActive = function ( value ) { /** * Check if the button is active * + * @protected * @return {boolean} The button is active */ OO.ui.mixin.ButtonElement.prototype.isActive = function () { @@ -3332,6 +3336,7 @@ OO.ui.mixin.AccessKeyedElement.prototype.getAccessKey = function () { * * @constructor * @param {Object} [config] Configuration options + * @cfg {boolean} [active=false] Whether button should be shown as active * @cfg {string} [href] Hyperlink to visit when the button is clicked. * @cfg {string} [target] The frame or window in which to open the hyperlink. * @cfg {boolean} [noFollow] Search engine traversal hint (default: true) @@ -3366,6 +3371,7 @@ OO.ui.ButtonWidget = function OoUiButtonWidget( config ) { this.$element .addClass( 'oo-ui-buttonWidget' ) .append( this.$button ); + this.setActive( config.active ); this.setHref( config.href ); this.setTarget( config.target ); this.setNoFollow( config.noFollow ); @@ -3522,6 +3528,14 @@ OO.ui.ButtonWidget.prototype.setNoFollow = function ( noFollow ) { return this; }; +// Override method visibility hints from ButtonElement +/** + * @method setActive + */ +/** + * @method isActive + */ + /** * A ButtonGroupWidget groups related buttons and is used together with OO.ui.ButtonWidget and * its subclasses. Each button in a group is addressed by a unique reference. Buttons can be added, diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index c1150d0795..3a99fba057 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.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:02Z + * Date: 2016-05-10T22:58:27Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css index 957dcfcce2..d757813d4f 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css index 1faf7e5281..82335a475a 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js index 49b96748dd..d9764487c8 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars.js +++ b/resources/lib/oojs-ui/oojs-ui-toolbars.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:02Z + * Date: 2016-05-10T22:58:27Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css index 4de8cea956..7a45a25887 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css index 5c48ea526c..a530235a0b 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -330,6 +330,7 @@ } .oo-ui-toggleSwitchWidget.oo-ui-widget-enabled:focus { border-color: #347bff; + box-shadow: inset 0 0 0 1px #347bff; outline: 0; } .oo-ui-toggleSwitchWidget.oo-ui-widget-enabled:focus.oo-ui-toggleWidget-on { @@ -1002,12 +1003,12 @@ .oo-ui-numberInputWidget-field > .oo-ui-buttonWidget { width: 2.5em; } -.oo-ui-numberInputWidget-minusButton.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button { +.oo-ui-numberInputWidget-minusButton.oo-ui-buttonElement-framed > .oo-ui-buttonElement-button { border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-width: 0; } -.oo-ui-numberInputWidget-plusButton.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button { +.oo-ui-numberInputWidget-plusButton.oo-ui-buttonElement-framed > .oo-ui-buttonElement-button { border-top-left-radius: 0; border-bottom-left-radius: 0; border-left-width: 0; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js index 366aa38eb9..e3c2bd5f30 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets.js +++ b/resources/lib/oojs-ui/oojs-ui-widgets.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:02Z + * Date: 2016-05-10T22:58:27Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css index 764f40c5d1..6dfe142ab9 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-actionWidget.oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css index deda1d0c57..9a544d6d95 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:06Z + * Date: 2016-05-10T22:58:31Z */ .oo-ui-window { background: transparent; diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js index 93a870cb68..37b7d90d98 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows.js +++ b/resources/lib/oojs-ui/oojs-ui-windows.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.1 + * OOjs UI v0.17.2 * 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-05-03T22:58:02Z + * Date: 2016-05-10T22:58:27Z */ ( function ( OO ) { -- 2.20.1