jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395781 )
Change subject: Hygiene: Use Element.closest where appropriate ...................................................................... Hygiene: Use Element.closest where appropriate Change-Id: Ia2182efe3f8c2877674b042f72ff583b566392fc --- M lib/media.js M lib/mobile-util.js M lib/parseProperty.js M lib/selectors.js 4 files changed, 4 insertions(+), 14 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/media.js b/lib/media.js index 136aa86..6e6f81b 100644 --- a/lib/media.js +++ b/lib/media.js @@ -2,7 +2,6 @@ const domino = require('domino'); const api = require('./api-util'); -const mUtil = require('./mobile-util'); const Title = require('mediawiki-title').Title; const Selectors = require('./selectors').MediaSelectors; const Blacklist = require('./selectors').MediaBlacklist; @@ -92,12 +91,8 @@ }; }); } else if (mediaType === Audio) { - let parent = elem.parentNode; - while (parent) { - if (mUtil.isElement(parent) && parent.id === SpokenWikipediaId) { - audioType = 'spoken'; - } - parent = parent.parentNode; + if (elem.closest(SpokenWikipediaId)) { + audioType = 'spoken'; } } else if (mediaType === Pronunciation) { title = `File:${elem.getAttribute('title')}`; diff --git a/lib/mobile-util.js b/lib/mobile-util.js index ee28266..41f3e3c 100644 --- a/lib/mobile-util.js +++ b/lib/mobile-util.js @@ -5,7 +5,6 @@ const uuid = require('cassandra-uuid').TimeUuid; const HTTPError = require('./util').HTTPError; const transforms = require('./transforms'); -const NodeType = require('./nodeType'); const mUtil = {}; const NS_MAIN = 0; @@ -50,10 +49,6 @@ }; mUtil.isNonempty = underscore.negate(mUtil.isEmpty); - -mUtil.isElement = function(node) { - return node.nodeType === NodeType.ELEMENT_NODE; -}; /** * @param {*} val input value diff --git a/lib/parseProperty.js b/lib/parseProperty.js index caa9550..36bd474 100644 --- a/lib/parseProperty.js +++ b/lib/parseProperty.js @@ -33,7 +33,7 @@ * https://en.wikipedia.org/wiki/Wikipedia:WikiProject_Spoken_Wikipedia/Template_guidelines */ function parseSpokenWikipedia(doc, page) { - const spokenSectionDiv = doc.querySelector(`div#${SpokenWikipediaId}`); + const spokenSectionDiv = doc.querySelector(`div${SpokenWikipediaId}`); if (spokenSectionDiv) { const dataMW = spokenSectionDiv.getAttribute('data-mw'); const parsedData = dataMW && JSON.parse(dataMW); diff --git a/lib/selectors.js b/lib/selectors.js index 3e66897..0aa87b9 100644 --- a/lib/selectors.js +++ b/lib/selectors.js @@ -22,7 +22,7 @@ const VideoSelectors = MediaSelectors.filter(selector => selector.includes('Video')); const PronunciationSelector = MediaSelectors.filter(selector => selector.includes('IPA'))[0]; -const SpokenWikipediaId = 'section_SpokenWikipedia'; +const SpokenWikipediaId = '#section_SpokenWikipedia'; module.exports = { -- To view, visit https://gerrit.wikimedia.org/r/395781 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2182efe3f8c2877674b042f72ff583b566392fc Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Mhurd <mh...@wikimedia.org> Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits