jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370173 )
Change subject: Do not add a background image if the icon is not defined
......................................................................
Do not add a background image if the icon is not defined
Bug: T172500
Change-Id: Ib658651e04090ec4f5bc1f5bacbbfb0d7e7f893e
---
M modules/jquery.wikiEditor.toolbar.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jquery.wikiEditor.toolbar.js
b/modules/jquery.wikiEditor.toolbar.js
index 9f6915f..5ea5b66 100644
--- a/modules/jquery.wikiEditor.toolbar.js
+++ b/modules/jquery.wikiEditor.toolbar.js
@@ -336,7 +336,7 @@
$button
.addClass(
'wikiEditor-toolbar-spritedButton' )
.css(
'backgroundPosition', offsetOrIcon[ 0 ] + 'px ' + offsetOrIcon[ 1 ] + 'px' );
- } else {
+ } else if ( offsetOrIcon !==
undefined ) { // Bug T172500
$button
.css(
'background-image', 'url(' + offsetOrIcon + ')' );
}
--
To view, visit https://gerrit.wikimedia.org/r/370173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib658651e04090ec4f5bc1f5bacbbfb0d7e7f893e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits