X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27user_edit%27%2C%20userid=session.user.id%29%20%7D%7D?a=blobdiff_plain;f=resources%2Flib%2Foojs-ui%2Foojs-ui-wikimediaui.js;h=ce993d8e712d8131c8b2cf6dc57906bd50a515d2;hb=7447a851ea4ed0965ff07ee874d0925b6fbd53fd;hp=e88914977e55850749849dd797fb79e550938c6e;hpb=6f7e982df6479e27c3b17f2deda8404ef55f50e6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/lib/oojs-ui/oojs-ui-wikimediaui.js b/resources/lib/oojs-ui/oojs-ui-wikimediaui.js
index e88914977e..ce993d8e71 100644
--- a/resources/lib/oojs-ui/oojs-ui-wikimediaui.js
+++ b/resources/lib/oojs-ui/oojs-ui-wikimediaui.js
@@ -1,12 +1,12 @@
 /*!
- * OOUI v0.25.2
+ * OOUI v0.26.2
  * https://www.mediawiki.org/wiki/OOUI
  *
  * Copyright 2011–2018 OOUI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2018-02-07T00:27:24Z
+ * Date: 2018-04-04T17:22:44Z
  */
 ( function ( OO ) {
 
@@ -34,7 +34,7 @@ OO.inheritClass( OO.ui.WikimediaUITheme, OO.ui.Theme );
  */
 OO.ui.WikimediaUITheme.prototype.getElementClasses = function ( element ) {
 	// Parent method
-	var variant, isFramed, isActive,
+	var variant, isFramed, isActive, isToolOrGroup,
 		variants = {
 			warning: false,
 			invert: false,
@@ -47,11 +47,14 @@ OO.ui.WikimediaUITheme.prototype.getElementClasses = function ( element ) {
 	if ( element.supports( [ 'hasFlag' ] ) ) {
 		isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed();
 		isActive = element.supports( [ 'isActive' ] ) && element.isActive();
+		isToolOrGroup =
+			( OO.ui.Tool && element instanceof OO.ui.Tool ) ||
+			( OO.ui.ToolGroup && element instanceof OO.ui.ToolGroup );
 		if (
 			// Button with a dark background
 			isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) ||
 			// Toolbar with a dark background
-			OO.ui.ToolGroup && element instanceof OO.ui.ToolGroup && ( isActive || element.hasFlag( 'primary' ) )
+			isToolOrGroup && element.hasFlag( 'primary' )
 		) {
 			// … use white icon / indicator, regardless of other flags
 			variants.invert = true;
@@ -60,7 +63,15 @@ OO.ui.WikimediaUITheme.prototype.getElementClasses = function ( element ) {
 			variants.invert = false;
 		} else if ( !element.isDisabled() ) {
 			// Any other kind of button, use the right colored icon / indicator if available
-			variants.progressive = element.hasFlag( 'progressive' );
+			variants.progressive = element.hasFlag( 'progressive' ) ||
+				// Active tools/toolgroups
+				( isToolOrGroup && isActive ) ||
+				// Pressed or selected outline option widgets
+				(
+					OO.ui.OutlineOptionWidget && element instanceof OO.ui.OutlineOptionWidget &&
+					( element.isPressed() || element.isSelected() )
+				);
+
 			variants.destructive = element.hasFlag( 'destructive' );
 			variants.warning = element.hasFlag( 'warning' );
 		}