Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348151 )
Change subject: Follow-up 57a06a6e: .getAttribute might be 'guaranteed', but
not from null
......................................................................
Follow-up 57a06a6e: .getAttribute might be 'guaranteed', but not from null
Whoops.
Bug: T162939
Change-Id: I5a9315e3cfc8a9e8edfb2ef597daeae09bbf5c5e
---
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/51/348151/1
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index a35ea3d..9fe721b 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -207,14 +207,14 @@
// Indexing items
indexingField = this.indexing.getField();
indexingOption = this.getMetaItem( 'mwIndex' );
- indexingType = indexingOption.getAttribute( 'property' ) || 'default';
+ indexingType = indexingOption && indexingOption.getAttribute(
'property' ) || 'default';
indexingField.selectItemByData( indexingType );
this.indexingOptionTouched = false;
// New section edit link items
newSectionEditField = this.newEditSectionLink.getField();
newSectionEditLinkOption = this.getMetaItem( 'mwNewSectionEdit' );
- newSectionEditLinkType = newSectionEditLinkOption.getAttribute(
'property' ) || 'default';
+ newSectionEditLinkType = newSectionEditLinkOption &&
newSectionEditLinkOption.getAttribute( 'property' ) || 'default';
newSectionEditField.selectItemByData( newSectionEditLinkType );
this.newSectionEditLinkOptionTouched = false;
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
index 706b03e..f08bd03 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
@@ -262,9 +262,9 @@
this.metaList = metaList;
// Table of Contents items
- tableOfContentsMetaItem = this.getMetaItem( 'mwTOC' );
tableOfContentsField = this.tableOfContents.getField();
- tableOfContentsMode = tableOfContentsMetaItem.getAttribute( 'property'
) || 'default';
+ tableOfContentsMetaItem = this.getMetaItem( 'mwTOC' );
+ tableOfContentsMode = tableOfContentsMetaItem &&
tableOfContentsMetaItem.getAttribute( 'property' ) || 'default';
tableOfContentsField.selectItemByData( tableOfContentsMode );
this.tableOfContentsTouched = false;
--
To view, visit https://gerrit.wikimedia.org/r/348151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a9315e3cfc8a9e8edfb2ef597daeae09bbf5c5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
