jenkins-bot has submitted this change and it was merged.
Change subject: article: Remove bracketed text from the title before looking to
bold it in the extract
......................................................................
article: Remove bracketed text from the title before looking to bold it in the
extract
Bug: T69224
Change-Id: I5306101a7acd3c33c55989e97c7581a403594645
---
M resources/ext.popups.renderer.article.js
M tests/qunit/ext.popups.renderer.article.test.js
2 files changed, 14 insertions(+), 4 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups.renderer.article.js
b/resources/ext.popups.renderer.article.js
index 2a26676..821ff2a 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -186,12 +186,16 @@
* @return {Array} of elements to appended
*/
article.getProcessedElements = function ( extract, title ) {
- var elements = [],
- escapedTitle = mw.RegExp.escape( title ), // Escape
RegExp elements
- regExp = new RegExp( '(^|\\s)(' + escapedTitle +
')(|$)', 'i' ),
+ var regExp, escapedTitle,
+ elements = [],
boldIdentifier = '<bi-' + Math.random() + '>',
snip = '<snip-' + Math.random() + '>';
+ title = article.removeParensFromText( title );
+ title = title.replace( /\s+/g, ' ' ).trim(); // Remove extra
white spaces
+ escapedTitle = mw.RegExp.escape( title ); // Escape RegExp
elements
+ regExp = new RegExp( '(^|\\s)(' + escapedTitle + ')(|$)', 'i' );
+
// Remove text in parentheses along with the parentheses
extract = article.removeParensFromText( extract );
extract = extract.replace( /\s+/, ' ' ); // Remove extra white
spaces
diff --git a/tests/qunit/ext.popups.renderer.article.test.js
b/tests/qunit/ext.popups.renderer.article.test.js
index 30dae3a..2f77a12 100644
--- a/tests/qunit/ext.popups.renderer.article.test.js
+++ b/tests/qunit/ext.popups.renderer.article.test.js
@@ -3,7 +3,7 @@
QUnit.module( 'ext.popups.renderer.renderers.article',
QUnit.newMwEnvironment() );
QUnit.test( 'render.article.getProcessedElements', function ( assert ) {
- QUnit.expect( 14 );
+ QUnit.expect( 15 );
function test( extract, title, expected, msg ) {
var $div = $( '<div>' ).append(
@@ -96,6 +96,12 @@
'Repeated title'
);
+ test(
+ 'Evil Empire is the second studio album', 'Evil Empire
(album)',
+ '<b>Evil Empire</b> is the second studio album',
+ 'Extra information in title in paranthesis'
+ );
+
} );
QUnit.test( 'render.article.getClosestYPosition', function ( assert ) {
QUnit.expect( 3 );
--
To view, visit https://gerrit.wikimedia.org/r/183488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5306101a7acd3c33c55989e97c7581a403594645
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: Werdna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
