[MediaWiki-commits] [Gerrit] $wgNoticeCloseButton shouldn't load closeWindow19x19.png fro... - change (mediawiki...CentralNotice)

[Rosalieper (Code Review)]

Rosalieper has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/247990

Change subject: $wgNoticeCloseButton shouldn't load closeWindow19x19.png from 
upload.wikimedia.org
......................................................................

$wgNoticeCloseButton shouldn't load closeWindow19x19.png from 
upload.wikimedia.org

This fix is to remove the functionality of CloseWindow19x19.png
button(icon) to load from the upload.wikimedia.org website.
I downloaded the .png icon into the resource/infrastructure/ folder
so that i can access the file directly.

Bug: T72462
Change-Id: Ia61b18a83dbab9540c2d9068a10eab31805403cb
---
M CentralNotice.php
A resources/infrastructure/CloseWindow19x19.png
M resources/infrastructure/bannereditor.js
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/90/247990/1

diff --git a/CentralNotice.php b/CentralNotice.php
index d25a50c..a139abc 100644
--- a/CentralNotice.php
+++ b/CentralNotice.php
@@ -104,6 +104,7 @@
 $wgNoticeDailyCounterSource = 
'http://wikimediafoundation.org/wiki/Special:DailyTotal?action=raw';
 
 // URL for a banner close button
+// Deprecated
 $wgNoticeCloseButton = 
'//upload.wikimedia.org/wikipedia/foundation/2/20/CloseWindow19x19.png';
 
 // URL prefix where banner screenshots are stored. False if this feature is 
disabled.
diff --git a/resources/infrastructure/CloseWindow19x19.png 
b/resources/infrastructure/CloseWindow19x19.png
new file mode 100644
index 0000000..c96d9ff
--- /dev/null
+++ b/resources/infrastructure/CloseWindow19x19.png
Binary files differ
diff --git a/resources/infrastructure/bannereditor.js 
b/resources/infrastructure/bannereditor.js
index 5d56399..9e3d2c4 100644
--- a/resources/infrastructure/bannereditor.js
+++ b/resources/infrastructure/bannereditor.js
@@ -165,13 +165,14 @@
                 * @param buttonType
                 */
                insertButton: function( buttonType ) {
+                       var CloseButton = 'CloseWindow19x19.png';
                        var buttonValue, sel;
                        var bannerField = document.getElementById( 
'mw-input-wpbanner-body' );
                        if ( buttonType === 'close' ) {
                                buttonValue = '<a href="#" title="'
                                        + mw.msg( 'centralnotice-close-title' )
                                        + '" 
onclick="mw.centralNotice.hideBanner();return false;">'
-                                       + '<img border="0" src="' + 
mw.config.get( 'wgNoticeCloseButton' )
+                                       + '<img border="0" src="' + CloseButton
                                        + '" alt="' + mw.msg( 
'centralnotice-close-title' )
                                        + '" /></a>';
                        }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia61b18a83dbab9540c2d9068a10eab31805403cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Rosalieper <rosaliepers...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits