jenkins-bot has submitted this change and it was merged.

Change subject: Allow brackets in createImgThumbnail
......................................................................


Allow brackets in createImgThumbnail

Changes:
* Quote the URL with double quotes when generating the background-image
  rule

Bug: T129177
Change-Id: I74748c7efe67954272ce0a539455b0b00001a26a
---
M resources/ext.popups.renderer.article.js
M tests/qunit/ext.popups.renderer.article.test.js
2 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Phuedx: 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 4182c47..7be99eb 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -402,7 +402,7 @@
        article.createImgThumbnail = function ( className, url ) {
                return $( '<div>' )
                        .addClass( className )
-                       .css( 'background-image', 'url(' + url + ')' );
+                       .css( 'background-image', 'url("' + url.replace( /"/g, 
'\\"' ) + '")' );
        };
 
        /**
diff --git a/tests/qunit/ext.popups.renderer.article.test.js 
b/tests/qunit/ext.popups.renderer.article.test.js
index 30dae3a..68e9d33 100644
--- a/tests/qunit/ext.popups.renderer.article.test.js
+++ b/tests/qunit/ext.popups.renderer.article.test.js
@@ -2,6 +2,11 @@
 
        QUnit.module( 'ext.popups.renderer.renderers.article', 
QUnit.newMwEnvironment() );
 
+       QUnit.test( 'render.article.createImgThumbnail', 1, function ( assert ) 
{
+               var $container = 
mw.popups.render.renderers.article.createImgThumbnail( 'foo', '/w/test 
"123"(bar).gif' );
+               assert.equal( $container.css( 'background-image' ), 
'url("/w/test \\"123\\"(bar).gif")' );
+       } );
+
        QUnit.test( 'render.article.getProcessedElements', function ( assert ) {
                QUnit.expect( 14 );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/288094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I74748c7efe67954272ce0a539455b0b00001a26a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to