jenkins-bot has submitted this change and it was merged.
Change subject: renderer.article: Remove leading spaces before brackets
......................................................................
renderer.article: Remove leading spaces before brackets
Bug: T69225
Change-Id: I83f79fa0ebd19bea6ed7ea266cece0778210adb2
---
M resources/ext.popups.renderer.article.js
M tests/qunit/ext.popups.renderer.article.test.js
2 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Werdna: 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 7d100ba..9f2c33b 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -210,6 +210,10 @@
continue;
}
if ( level === 0 ) {
+ // Remove leading spaces before brackets
+ if ( ch === ' ' && string.charAt( i + 1 ) ===
'(' ) {
+ continue;
+ }
newString += ch;
}
}
diff --git a/tests/qunit/ext.popups.renderer.article.test.js
b/tests/qunit/ext.popups.renderer.article.test.js
index 81e58bd..9d1622e 100644
--- a/tests/qunit/ext.popups.renderer.article.test.js
+++ b/tests/qunit/ext.popups.renderer.article.test.js
@@ -2,7 +2,7 @@
QUnit.module( 'ext.popups' );
QUnit.test( 'render.article.getProcessedElements', function ( assert ) {
- QUnit.expect( 11 );
+ QUnit.expect( 12 );
function test ( extract, title, expected, msg ) {
var $div = $( '<div>' ).append(
@@ -60,6 +60,12 @@
);
test(
+ 'Vappu (born August 7), also known as Lexy', 'Vappu',
+ '<b>Vappu</b>, also known as Lexy',
+ 'Spaces around bracketed text should be removed'
+ );
+
+ test(
'Epic XSS <script>alert("XSS")</script> is epic', 'Epic
XSS',
'<b>Epic XSS</b> <script>alert</script> is
epic',
'XSS Attack'
--
To view, visit https://gerrit.wikimedia.org/r/182450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83f79fa0ebd19bea6ed7ea266cece0778210adb2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: Ricordisamoa <[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
