diff options
Diffstat (limited to 'resources/lib/oojs-ui/oojs-ui-mediawiki.js')
| -rw-r--r-- | resources/lib/oojs-ui/oojs-ui-mediawiki.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index ec6e45dc65f2..b8dbf7b3696e 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.21.0 + * OOjs UI v0.21.1 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-04-11T22:51:05Z + * Date: 2017-04-18T23:32:49Z */ ( function ( OO ) { @@ -48,14 +48,19 @@ OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) { if ( element.supports( [ 'hasFlag' ] ) ) { isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed(); isActive = element.supports( [ 'isActive' ] ) && element.isActive(); - if ( isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) ) { - // Button with a dark background, use white icon + if ( + // Button with a dark background + isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) || + // Toolbar with a dark background + element instanceof OO.ui.ToolGroup && ( isActive || element.hasFlag( 'primary' ) ) + ) { + // … use white icon / indicator, regardless of other flags variants.invert = true; } else if ( !isFramed && element.isDisabled() ) { - // Frameless disabled button, always use black icon regardless of flags + // Frameless disabled button, always use black icon / indicator regardless of other flags variants.invert = false; } else if ( !element.isDisabled() ) { - // Any other kind of button, use the right colored icon if available + // Any other kind of button, use the right colored icon / indicator if available variants.progressive = element.hasFlag( 'progressive' ); variants.constructive = element.hasFlag( 'constructive' ); variants.destructive = element.hasFlag( 'destructive' ); |