Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178641
Change subject: Rename some things for my sanity
......................................................................
Rename some things for my sanity
Change-Id: I101943fa027947e73f7f7559bd706faadad90e95
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
3 files changed, 26 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/41/178641/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 53f1368..ccff1fa 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -447,21 +447,21 @@
/**
* Handle change event on the positionCheckbox element.
*
- * @param {boolean} checked Checkbox status
+ * @param {boolean} isSelected Checkbox status
*/
-ve.ui.MWMediaDialog.prototype.onPositionCheckboxChange = function ( checked ) {
+ve.ui.MWMediaDialog.prototype.onPositionCheckboxChange = function ( isSelected
) {
var newPositionValue,
currentModelAlignment = this.imageModel.getAlignment();
- this.positionSelect.setDisabled( !checked );
+ this.positionSelect.setDisabled( !isSelected );
this.checkChanged();
// Only update the model if the current value is different than that
// of the image model
if (
- ( currentModelAlignment === 'none' && checked ) ||
- ( currentModelAlignment !== 'none' && !checked )
+ ( currentModelAlignment === 'none' && isSelected ) ||
+ ( currentModelAlignment !== 'none' && !isSelected )
) {
- if ( checked ) {
+ if ( isSelected ) {
// Picking a floating alignment value will create a
block image
// no matter what the type is, so in here we want to
calculate
// the default alignment of a block to set as our
initial alignment
@@ -479,13 +479,13 @@
/**
* Handle change event on the positionCheckbox element.
*
- * @param {boolean} checked Checkbox status
+ * @param {boolean} isSelected Checkbox status
*/
-ve.ui.MWMediaDialog.prototype.onBorderCheckboxChange = function ( checked ) {
+ve.ui.MWMediaDialog.prototype.onBorderCheckboxChange = function ( isSelected )
{
// Only update if the value is different than the model
- if ( this.imageModel.hasBorder() !== checked ) {
+ if ( this.imageModel.hasBorder() !== isSelected ) {
// Update the image model
- this.imageModel.toggleBorder( checked );
+ this.imageModel.toggleBorder( isSelected );
this.checkChanged();
}
};
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index 79cb9a5..f787201 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -87,10 +87,10 @@
);
this.displayTitleTouched = false;
- this.enableDisplayTitleInput = new OO.ui.CheckboxInputWidget( { $:
this.$ } );
- this.enableDisplayTitleInput.connect( this, { change:
'onEnableDisplayTitleInputChange' } );
+ this.enableDisplayTitleCheckbox = new OO.ui.CheckboxInputWidget( { $:
this.$ } );
+ this.enableDisplayTitleCheckbox.connect( this, { change:
'onEnableDisplayTitleCheckboxChange' } );
this.enableDisplayTitleField = new OO.ui.FieldLayout(
- this.enableDisplayTitleInput,
+ this.enableDisplayTitleCheckbox,
{
$: this.$,
align: 'inline',
@@ -155,11 +155,11 @@
*
* @param {boolean} value Whether a redirect is to be set for this page
*/
-ve.ui.MWAdvancedSettingsPage.prototype.onEnableDisplayTitleInputChange =
function ( value ) {
+ve.ui.MWAdvancedSettingsPage.prototype.onEnableDisplayTitleCheckboxChange =
function ( value ) {
this.displayTitleInput.setDisabled( !value );
if ( !value ) {
this.displayTitleInput.setValue( '' );
- this.enableDisplayTitleInput.setSelected( false );
+ this.enableDisplayTitleCheckbox.setSelected( false );
}
this.displayTitleTouched = true;
};
@@ -247,15 +247,15 @@
newSectionEditField.selectItem( newSectionEditField.getItemFromData(
newSectionEditLinkType ) );
this.newSectionEditLinkOptionTouched = false;
- this.enableDisplayTitleInput.setSelected( !!displayTitleItem );
+ this.enableDisplayTitleCheckbox.setSelected( !!displayTitleItem );
this.displayTitleInput.setValue( displayTitle );
this.displayTitleInput.setDisabled( !displayTitle );
this.displayTitleTouched = false;
// Simple checkbox items
$.each( this.metaItemCheckboxes, function () {
- var currentValue = !!advancedSettingsPage.getMetaItem(
this.metaName );
- this.fieldLayout.getField().setSelected( currentValue );
+ var isSelected = !!advancedSettingsPage.getMetaItem(
this.metaName );
+ this.fieldLayout.getField().setSelected( isSelected );
} );
};
@@ -348,11 +348,11 @@
$.each( this.metaItemCheckboxes, function () {
var currentItem = advancedSettingsPage.getMetaItem(
this.metaName ),
- newValue = this.fieldLayout.getField().isSelected();
+ isSelected = this.fieldLayout.getField().isSelected();
- if ( currentItem && !newValue ) {
+ if ( currentItem && !isSelected ) {
currentItem.remove();
- } else if ( !currentItem && newValue ) {
+ } else if ( !currentItem && isSelected ) {
advancedSettingsPage.metaList.insertMeta( { type:
this.metaName } );
}
} );
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
index 0129888..17c0114 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
@@ -266,8 +266,8 @@
// Simple checkbox items
$.each( this.metaItemCheckboxes, function () {
- var currentValue = !!settingsPage.getMetaItem( this.metaName );
- this.fieldLayout.getField().setSelected( currentValue );
+ var isSelected = !!settingsPage.getMetaItem( this.metaName );
+ this.fieldLayout.getField().setSelected( isSelected );
} );
};
@@ -349,11 +349,11 @@
$.each( this.metaItemCheckboxes, function () {
var currentItem = settingsPage.getMetaItem( this.metaName ),
- newValue = this.fieldLayout.getField().isSelected();
+ isSelected = this.fieldLayout.getField().isSelected();
- if ( currentItem && !newValue ) {
+ if ( currentItem && !isSelected ) {
currentItem.remove();
- } else if ( !currentItem && newValue ) {
+ } else if ( !currentItem && isSelected ) {
settingsPage.metaList.insertMeta( { type: this.metaName
} );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/178641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I101943fa027947e73f7f7559bd706faadad90e95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
