wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow-up 57a06a6e: .getAttribute might be 'guaranteed', but not from null

Browse source 
Whoops.

Bug: T162939
Change-Id: I5a9315e3cfc8a9e8edfb2ef597daeae09bbf5c5e
This commit is contained in:
James D. Forrester 2017-04-13 14:38:20 -07:00
parent f20b9b0aa0
commit 0ca821b321
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
View file

@ -207,14 +207,14 @@ ve.ui.MWAdvancedSettingsPage.prototype.setup = function ( metaList ) {
// Indexing items // Indexing items
indexingField = this.indexing.getField(); indexingField = this.indexing.getField();
indexingOption = this.getMetaItem( 'mwIndex' ); indexingOption = this.getMetaItem( 'mwIndex' );
indexingType = indexingOption.getAttribute( 'property' ) || 'default'; indexingType = indexingOption && indexingOption.getAttribute( 'property' ) || 'default';
indexingField.selectItemByData( indexingType ); indexingField.selectItemByData( indexingType );
this.indexingOptionTouched = false; this.indexingOptionTouched = false;
// New section edit link items // New section edit link items
newSectionEditField = this.newEditSectionLink.getField(); newSectionEditField = this.newEditSectionLink.getField();
newSectionEditLinkOption = this.getMetaItem( 'mwNewSectionEdit' ); newSectionEditLinkOption = this.getMetaItem( 'mwNewSectionEdit' );
newSectionEditLinkType = newSectionEditLinkOption.getAttribute( 'property' ) || 'default'; newSectionEditLinkType = newSectionEditLinkOption && newSectionEditLinkOption.getAttribute( 'property' ) || 'default';
newSectionEditField.selectItemByData( newSectionEditLinkType ); newSectionEditField.selectItemByData( newSectionEditLinkType );
this.newSectionEditLinkOptionTouched = false; this.newSectionEditLinkOptionTouched = false;

4
modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
View file

@ -262,9 +262,9 @@ ve.ui.MWSettingsPage.prototype.setup = function ( metaList ) {
this.metaList = metaList; this.metaList = metaList;
// Table of Contents items // Table of Contents items
tableOfContentsMetaItem = this.getMetaItem( 'mwTOC' );
tableOfContentsField = this.tableOfContents.getField(); tableOfContentsField = this.tableOfContents.getField();
tableOfContentsMode = tableOfContentsMetaItem.getAttribute( 'property' ) || 'default'; tableOfContentsMetaItem = this.getMetaItem( 'mwTOC' );
tableOfContentsMode = tableOfContentsMetaItem && tableOfContentsMetaItem.getAttribute( 'property' ) || 'default';
tableOfContentsField.selectItemByData( tableOfContentsMode ); tableOfContentsField.selectItemByData( tableOfContentsMode );
this.tableOfContentsTouched = false; this.tableOfContentsTouched = false;