diff options
Diffstat (limited to 'resources/lib/oojs-ui/oojs-ui-mediawiki.js')
| -rw-r--r-- | resources/lib/oojs-ui/oojs-ui-mediawiki.js | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index eaca1f15..e6344f24 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.11.3 + * OOjs UI v0.12.12 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2015 OOjs Team and other contributors. + * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-05-12T12:15:37Z + * Date: 2015-10-13T20:38:18Z */ /** * @class @@ -16,7 +16,7 @@ */ OO.ui.MediaWikiTheme = function OoUiMediaWikiTheme() { // Parent constructor - OO.ui.MediaWikiTheme.super.call( this ); + OO.ui.MediaWikiTheme.parent.call( this ); }; /* Setup */ @@ -30,7 +30,7 @@ OO.inheritClass( OO.ui.MediaWikiTheme, OO.ui.Theme ); */ OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) { // Parent method - var variant, + var variant, isFramed, isActive, variants = { warning: false, invert: false, @@ -39,12 +39,15 @@ OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) { destructive: false }, // Parent method - classes = OO.ui.MediaWikiTheme.super.prototype.getElementClasses.call( this, element ), - isFramed; + classes = OO.ui.MediaWikiTheme.parent.prototype.getElementClasses.call( this, element ); if ( element.supports( [ 'hasFlag' ] ) ) { isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed(); - if ( isFramed && ( element.isDisabled() || element.hasFlag( 'primary' ) ) ) { + isActive = element.supports( [ 'isActive' ] ) && element.isActive(); + if ( + ( isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) ) || + ( !isFramed && element.hasFlag( 'primary' ) ) + ) { variants.invert = true; } else { variants.progressive = element.hasFlag( 'progressive' ); |