jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396420 )
Change subject: Media: Remove unwanted selectors from the blacklist ...................................................................... Media: Remove unwanted selectors from the blacklist We probably don't want these after all, per Gergo's comments on https://gerrit.wikimedia.org/r/#/c/396031/. This partially reverts that commit. Bug: T177430 Change-Id: I54b5be4bc6acad2f8ad439f1ff2ad096df5d0def --- M lib/selectors.js M test/lib/media/media-test-inclusion.js 2 files changed, 2 insertions(+), 13 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/selectors.js b/lib/selectors.js index 63c7b76..24a532c 100644 --- a/lib/selectors.js +++ b/lib/selectors.js @@ -17,10 +17,7 @@ // MultimediaViewer. const MediaBlacklist = [ '.metadata', - '.noviewer', - '.noarticletext', - '#siteNotice', - 'ul.mw-gallery-slideshow li.gallerybox' // thumbnails of a slideshow gallery + '.noviewer' ]; const ImageSelectors = MediaSelectors.filter(selector => selector.includes('Image')); diff --git a/test/lib/media/media-test-inclusion.js b/test/lib/media/media-test-inclusion.js index c3df360..551ebe0 100644 --- a/test/lib/media/media-test-inclusion.js +++ b/test/lib/media/media-test-inclusion.js @@ -31,14 +31,6 @@ const imageNoViewer = '<figure typeof="mw:Image" class="noviewer"><img resource="./File:Foo"/></figure>'; const imageMetadata = '<span class="metadata"><figure typeof="mw:Image"><img resource="./File:Foo"/></figure></span>'; -const imageNoArticleText = '<span class="noarticletext"><figure typeof="mw:Image"><img resource="./File:Foo"/></figure></span>'; -const imageSiteNotice = '<span id="siteNotice"><figure typeof="mw:Image"><img resource="./File:Foo"/></figure></span>'; -const imageSlideshowGallery = - '<ul class="mw-gallery-slideshow">' + - '<li class="gallerybox">' + - '<figure typeof="mw:Image"><img resource="./File:Foo"/></figure>' + - '</li>' + - '</ul>'; const images = [imageFigure, imageSpan, imageFigureInline, imageThumbFigure, imageThumbSpan, imageThumbFigureInline]; const videos = [videoFigure, videoSpan, videoFigureInline, videoThumbFigure, videoThumbSpan, videoThumbFigureInline]; @@ -46,7 +38,7 @@ const validItems = images.concat(videos).concat(audio); const noType = [noTypeFigure, noTypeSpan, noTypeFigureInline]; -const blacklisted = [imageNoViewer, imageMetadata, imageNoArticleText, imageSiteNotice, imageSlideshowGallery]; +const blacklisted = [imageNoViewer, imageMetadata]; const invalidItems = noType.concat(blacklisted); describe('lib:media expected items are included or excluded', () => { -- To view, visit https://gerrit.wikimedia.org/r/396420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54b5be4bc6acad2f8ad439f1ff2ad096df5d0def Gerrit-PatchSet: 1 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: Gergő Tisza <gti...@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
