jenkins-bot has submitted this change and it was merged.
Change subject: Drop sections property, add text property on lead
......................................................................
Drop sections property, add text property on lead
Repeating information in the lead should only be possible
if generating a table of contents.
If this is desired for apps I'd suggest we explore other
cleaner ways to do this.
Bug: T145006
Change-Id: I5ad3f209547922bd69aa74c2045ea1a706952061
---
M routes/mobile-sections.js
M test/features/mobile-sections/pagecontent-v2.js
2 files changed, 15 insertions(+), 9 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index a8db119..451e22d 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -94,14 +94,19 @@
}
var hatnotes = transforms.extractHatnotes(lead, removeNodes);
var pronunciation = parse.parsePronunciation(lead,
input.meta.displaytitle);
- var infobox, text, intro;
+ var issues = transforms.extractPageIssues(lead, removeNodes);
+
+ var infobox, text, intro, sections;
+
if ( removeNodes ) {
infobox = transforms.extractInfobox(lead);
intro = transforms.extractLeadIntroduction(lead);
+ text = lead.body.innerHTML;
+ } else {
+ // update text after extractions have taken place
+ sections = buildLeadSections(input.page.sections);
+ input.page.sections[0].text = lead.body.innerHTML;
}
- var issues = transforms.extractPageIssues(lead, removeNodes);
- // update text after extractions have taken place
- input.page.sections[0].text = lead.body.innerHTML;
return {
ns: input.meta.ns,
@@ -128,7 +133,8 @@
infobox: infobox,
intro: intro,
geo: input.page.geo,
- sections: buildLeadSections(input.page.sections)
+ sections: sections,
+ text: text
};
}
diff --git a/test/features/mobile-sections/pagecontent-v2.js
b/test/features/mobile-sections/pagecontent-v2.js
index 54d7ba6..5ce020d 100644
--- a/test/features/mobile-sections/pagecontent-v2.js
+++ b/test/features/mobile-sections/pagecontent-v2.js
@@ -16,7 +16,7 @@
assert.ok(res.body.hatnotes[0],
'See also: <a href="/wiki/Military_order_(society)"
title=\"Military order (society)">Military order (society)</a>',
'hatnote property should be present on lead.');
- assert.ok(res.body.sections[0].text.indexOf('<div
class="hatnote">') === -1,
+ assert.ok(res.body.text.indexOf('<div class="hatnote">') ===
-1,
'Hatnote should not appear in lead section html.' );
});
});
@@ -26,7 +26,7 @@
.then(function (res) {
assert.deepEqual(res.status, 200);
assert.ok(res.body.infobox !== undefined);
- assert.ok(res.body.sections[0].text.indexOf('"infobox') === -1,
+ assert.ok(res.body.text.indexOf('"infobox') === -1,
'The infobox is removed in version 2 of the api.');
});
});
@@ -35,7 +35,7 @@
return preq.get({ uri: server.config.uri +
'en.wikipedia.org/v1/page/formatted-lead/User:Jdlrobson%2Fmcs-tests%2Fissues_bug'
})
.then(function (res) {
assert.deepEqual(res.status, 200);
-
assert.ok(res.body.sections[0].text.indexOf('ambox-multiple_issues') === -1,
+ assert.ok(res.body.text.indexOf('ambox-multiple_issues') ===
-1,
'No ambox multiple issues class in response.');
});
});
@@ -51,7 +51,7 @@
'Intro does not come from infobox.');
assert.ok(intro.indexOf( 'undefined' ) === -1,
'No undefined concatenations');
- assert.ok(res.body.sections[0].text.indexOf(intro) === -1,
+ assert.ok(res.body.text.indexOf(intro) === -1,
'Intro is not present in section text.');
});
});
--
To view, visit https://gerrit.wikimedia.org/r/309219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ad3f209547922bd69aa74c2045ea1a706952061
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
