Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/179541
Change subject: Update VE core submodule to master (b5e2b87) ...................................................................... Update VE core submodule to master (b5e2b87) New changes: 96d0936 Mark primary buttons as progressive as well 68f184c Localisation updates from https://translatewiki.net. b96c9dc [BREAKING CHANGE] Rename method cmpOffsetPaths to compareOffsetPaths 862f31d Convenience compareDocumentOrder method b5e2b87 Update OOjs UI to v0.5.0 Local fixes to correct for breaking change I32608c7f in OOjs UI. Change-Id: I8b895eb9ae70c87459ef96cde513279b404bebd7 --- M lib/ve 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 4 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/41/179541/1 diff --git a/lib/ve b/lib/ve index 9ac8136..b5e2b87 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit 9ac81365d2469e3416e70ef81476d1e16a594e21 +Subproject commit b5e2b870032ad981f419e1f518195233d09c063e diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js index 99dd28f..4731e5a 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js @@ -421,7 +421,7 @@ // Select the item without triggering the 'choose' event this.positionSelect.selectItem( item ); - this.positionCheckbox.setValue( alignment !== 'none' ); + this.positionCheckbox.setSelected( alignment !== 'none' ); this.checkChanged(); }; @@ -439,7 +439,7 @@ !this.imageModel.isBorderable() ); - this.borderCheckbox.setValue( + this.borderCheckbox.setSelected( this.imageModel.isBorderable() && this.imageModel.hasBorder() ); this.checkChanged(); @@ -764,7 +764,7 @@ ) : null ); - this.positionCheckbox.setValue( + this.positionCheckbox.setSelected( this.imageModel.isAligned() ); @@ -772,7 +772,7 @@ this.borderCheckbox.setDisabled( !this.imageModel.isBorderable() ); - this.borderCheckbox.setValue( + this.borderCheckbox.setSelected( this.imageModel.isBorderable() && this.imageModel.hasBorder() ); diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js index bf3bb43..79cb9a5 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js @@ -159,7 +159,7 @@ this.displayTitleInput.setDisabled( !value ); if ( !value ) { this.displayTitleInput.setValue( '' ); - this.enableDisplayTitleInput.setValue( false ); + this.enableDisplayTitleInput.setSelected( false ); } this.displayTitleTouched = true; }; @@ -247,7 +247,7 @@ newSectionEditField.selectItem( newSectionEditField.getItemFromData( newSectionEditLinkType ) ); this.newSectionEditLinkOptionTouched = false; - this.enableDisplayTitleInput.setValue( !!displayTitleItem ); + this.enableDisplayTitleInput.setSelected( !!displayTitleItem ); this.displayTitleInput.setValue( displayTitle ); this.displayTitleInput.setDisabled( !displayTitle ); this.displayTitleTouched = false; @@ -255,7 +255,7 @@ // Simple checkbox items $.each( this.metaItemCheckboxes, function () { var currentValue = !!advancedSettingsPage.getMetaItem( this.metaName ); - this.fieldLayout.getField().setValue( currentValue ); + this.fieldLayout.getField().setSelected( currentValue ); } ); }; @@ -348,7 +348,7 @@ $.each( this.metaItemCheckboxes, function () { var currentItem = advancedSettingsPage.getMetaItem( this.metaName ), - newValue = this.fieldLayout.getField().getValue(); + newValue = this.fieldLayout.getField().isSelected(); if ( currentItem && !newValue ) { currentItem.remove(); diff --git a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js index e1666b0..0129888 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js @@ -267,7 +267,7 @@ // Simple checkbox items $.each( this.metaItemCheckboxes, function () { var currentValue = !!settingsPage.getMetaItem( this.metaName ); - this.fieldLayout.getField().setValue( currentValue ); + this.fieldLayout.getField().setSelected( currentValue ); } ); }; @@ -349,7 +349,7 @@ $.each( this.metaItemCheckboxes, function () { var currentItem = settingsPage.getMetaItem( this.metaName ), - newValue = this.fieldLayout.getField().getValue(); + newValue = this.fieldLayout.getField().isSelected(); if ( currentItem && !newValue ) { currentItem.remove(); -- To view, visit https://gerrit.wikimedia.org/r/179541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b895eb9ae70c87459ef96cde513279b404bebd7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Bartosz Dziewoński <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
