Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191200
Change subject: FieldLayout: Clean up and remove lies
......................................................................
FieldLayout: Clean up and remove lies
Follow-up to abc1244b9cb9b87ff9adf0bc82ab9c1a5ed55d20.
Change-Id: Ie791e21cf6621f74e641d2e0ed764b8cd774b54f
---
M php/layouts/FieldLayout.php
M src/layouts/ActionFieldLayout.js
M src/layouts/FieldLayout.js
3 files changed, 6 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/00/191200/1
diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index 3e73fd6..b3ae9c8 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -46,13 +46,11 @@
// Config initialization
$config = array_merge( array( 'align' => 'left' ), $config );
- // Properties (must be set before parent constructor, which
calls #getTagName)
- $this->fieldWidget = $fieldWidget;
-
// Parent constructor
parent::__construct( $config );
// Properties
+ $this->fieldWidget = $fieldWidget;
$this->field = new Tag( 'div' );
$this->body = new Tag( $hasInputWidget ? 'label' : 'div' );
if ( isset( $config['help'] ) ) {
@@ -76,8 +74,8 @@
$this->body->addClasses( array( 'oo-ui-fieldLayout-body' ) );
$this->field
->addClasses( array( 'oo-ui-fieldLayout-field' ) )
- ->toggleClasses( array( 'oo-ui-fieldLayout-disable' ),
$fieldWidget->isDisabled() )
- ->appendContent( $fieldWidget );
+ ->toggleClasses( array( 'oo-ui-fieldLayout-disable' ),
$this->fieldWidget->isDisabled() )
+ ->appendContent( $this->fieldWidget );
$this->setAlignment( $config['align'] );
}
diff --git a/src/layouts/ActionFieldLayout.js b/src/layouts/ActionFieldLayout.js
index 8cfbdac..7a0500d 100644
--- a/src/layouts/ActionFieldLayout.js
+++ b/src/layouts/ActionFieldLayout.js
@@ -15,10 +15,6 @@
// Configuration initialization
config = $.extend( { align: 'left' }, config );
- // Properties (must be set before parent constructor, which calls
#getTagName)
- this.fieldWidget = fieldWidget;
- this.buttonWidget = buttonWidget;
-
// Parent constructor
OO.ui.ActionFieldLayout.super.call( this, fieldWidget, config );
@@ -26,14 +22,14 @@
OO.ui.LabelElement.call( this, config );
// Properties
+ this.fieldWidget = fieldWidget;
+ this.buttonWidget = buttonWidget;
this.$button = $( '<div>' )
.addClass( 'oo-ui-actionFieldLayout-button' )
.append( this.buttonWidget.$element );
-
this.$input = $( '<div>' )
.addClass( 'oo-ui-actionFieldLayout-input' )
.append( this.fieldWidget.$element );
-
this.$field
.addClass( 'oo-ui-actionFieldLayout' )
.append( this.$input, this.$button );
diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index dc58e81..8a81e8d 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -27,9 +27,6 @@
// Configuration initialization
config = $.extend( { align: 'left' }, config );
- // Properties (must be set before parent constructor, which calls
#getTagName)
- this.fieldWidget = fieldWidget;
-
// Parent constructor
OO.ui.FieldLayout.super.call( this, config );
@@ -37,6 +34,7 @@
OO.ui.LabelElement.call( this, config );
// Properties
+ this.fieldWidget = fieldWidget;
this.$field = $( '<div>' );
this.$body = $( '<' + ( hasInputWidget ? 'label' : 'div' ) + '>' );
this.align = null;
--
To view, visit https://gerrit.wikimedia.org/r/191200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie791e21cf6621f74e641d2e0ed764b8cd774b54f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
