jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/396085 )
Change subject: Media: Add section ID numbers
......................................................................
Media: Add section ID numbers
Note: This depends on a Parsoid change adding section numbering that is
not yet deployed. For now it will need to be tested against a local
Parsoid instance.
The spec and diff tests will be updated when the Parsoid change is
deployed.
Bug: T177430
Change-Id: If5424111a2d062550f910a1bee70f55b8a412a0d
---
M lib/media.js
M test/lib/media/media-test-metadata.js
2 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/media.js b/lib/media.js
index 6e6f81b..ca11c4c 100644
--- a/lib/media.js
+++ b/lib/media.js
@@ -64,6 +64,8 @@
html: figCaption.innerHTML,
text: figCaption.textContent
};
+ const section = elem.closest('section') || undefined;
+ const sectionId = section &&
parseInt(section.getAttribute('data-mw-section-id'), 10);
let title = resource &&
resource.getAttribute('resource').replace(/^.\//, '');
let startTime;
let endTime;
@@ -100,6 +102,7 @@
}
return {
title,
+ section_id: sectionId,
type: mediaType.name,
caption,
start_time: startTime,
diff --git a/test/lib/media/media-test-metadata.js
b/test/lib/media/media-test-metadata.js
index d472a2c..23ec1b5 100644
--- a/test/lib/media/media-test-metadata.js
+++ b/test/lib/media/media-test-metadata.js
@@ -38,6 +38,11 @@
'<a rel="mw:MediaLink" title="Foo">Pronunciation</a>' +
'</small>';
+const imageWithSection =
+ '<section data-mw-section-id="0">' +
+ '<figure typeof="mw:Image"><img resource="./File:Foo"/></figure>' +
+ '</section>';
+
describe('lib:media metadata is correctly parsed from HTML', () => {
it('all expected captions are present', () => {
@@ -77,4 +82,9 @@
assert.deepEqual(result.audio_type, 'pronunciation');
});
+ it('section is correctly identified', () => {
+ const result = media.getMediaItemInfoFromPage(imageWithSection)[0];
+ assert.deepEqual(result.section_id, 0);
+ });
+
});
--
To view, visit https://gerrit.wikimedia.org/r/396085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5424111a2d062550f910a1bee70f55b8a412a0d
Gerrit-PatchSet: 6
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: Mholloway <mhollo...@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
