jenkins-bot has submitted this change and it was merged.
Change subject: ButtonInputWidget: Don't double-mixin FlaggedElement
......................................................................
ButtonInputWidget: Don't double-mixin FlaggedElement
Already mixed in by parent class, InputWidget.
Change-Id: I48407db601e4810fd08f30fb93cb4942c3824b28
---
M php/widgets/ButtonInputWidget.php
M src/widgets/ButtonInputWidget.js
2 files changed, 0 insertions(+), 4 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/php/widgets/ButtonInputWidget.php
b/php/widgets/ButtonInputWidget.php
index 46226ad..b3bcb63 100644
--- a/php/widgets/ButtonInputWidget.php
+++ b/php/widgets/ButtonInputWidget.php
@@ -46,7 +46,6 @@
$this->mixin( $this->labelElementMixin = new LabelElement(
$this, $config ) );
$this->mixin( new TitledElement( $this,
array_merge( $config, array( 'titled' => $this->input )
) ) );
- $this->mixin( new FlaggedElement( $this, $config ) );
// Initialization
if ( !$config['useInputTag'] ) {
diff --git a/src/widgets/ButtonInputWidget.js b/src/widgets/ButtonInputWidget.js
index bda5b18..1d4d97f 100644
--- a/src/widgets/ButtonInputWidget.js
+++ b/src/widgets/ButtonInputWidget.js
@@ -23,7 +23,6 @@
* @mixins OO.ui.IndicatorElement
* @mixins OO.ui.LabelElement
* @mixins OO.ui.TitledElement
- * @mixins OO.ui.FlaggedElement
*
* @constructor
* @param {Object} [config] Configuration options
@@ -49,7 +48,6 @@
OO.ui.IndicatorElement.call( this, config );
OO.ui.LabelElement.call( this, config );
OO.ui.TitledElement.call( this, $.extend( {}, config, { $titled:
this.$input } ) );
- OO.ui.FlaggedElement.call( this, config );
// Initialization
if ( !config.useInputTag ) {
@@ -66,7 +64,6 @@
OO.mixinClass( OO.ui.ButtonInputWidget, OO.ui.IndicatorElement );
OO.mixinClass( OO.ui.ButtonInputWidget, OO.ui.LabelElement );
OO.mixinClass( OO.ui.ButtonInputWidget, OO.ui.TitledElement );
-OO.mixinClass( OO.ui.ButtonInputWidget, OO.ui.FlaggedElement );
/* Methods */
--
To view, visit https://gerrit.wikimedia.org/r/205597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48407db601e4810fd08f30fb93cb4942c3824b28
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
