jenkins-bot has submitted this change and it was merged.
Change subject: Workaround for display of SVG images in Safari
......................................................................
Workaround for display of SVG images in Safari
Tested in IE9 and Safari. It seems in Safari the mixture of jQuery
and setAttributeNS causes issues.
Bug: T138430
Change-Id: I4bc63da18d008487d0c8f7b906688e4c8c809efd
---
M resources/ext.popups.renderer.article.js
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Jhernandez: Looks good to me, but someone else must approve
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 7fa13e4..c5320d9 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -6,6 +6,7 @@
* @singleton
*/
var currentRequest,
+ isSafari = navigator.userAgent.match( /Safari/ ) !== null,
article = {},
surveyLink = mw.config.get( 'wgPopupsSurveyLink' ),
$window = $( window ),
@@ -385,8 +386,6 @@
ns = 'http://www.w3.org/2000/svg',
svgElement = article.createSVGTag( 'image' );
- // certain browsers e.g. ie9 will not correctly set attributes
from foreign namespaces (T134979)
- svgElement.setAttributeNS( ns, 'xlink:href', url );
$thumbnailSVGImage = $( svgElement );
$thumbnailSVGImage
.addClass( className )
@@ -398,6 +397,13 @@
'clip-path': 'url(#' + clipPath + ')'
} );
+ // Make image render in Safari (T138430)
+ if ( isSafari ) {
+ svgElement.setAttribute( 'xlink:href', url );
+ } else {
+ // certain browsers e.g. ie9 will not correctly set
attributes from foreign namespaces (T134979)
+ svgElement.setAttributeNS( ns, 'xlink:href', url );
+ }
$thumbnail = $( '<svg>' )
.attr( {
xmlns: ns,
--
To view, visit https://gerrit.wikimedia.org/r/296278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bc63da18d008487d0c8f7b906688e4c8c809efd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: Phuedx <g...@samsmith.io>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
