wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-11-24 06:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid OOUI/download icon nameclash

Browse source 
Short term fix to ensure icon doesn't change
when oo-ui is loaded.

Prefix with 'mf-' (we do this in main menu) to avoid nameclashes

Bug: T182162
Change-Id: Ia6ceb620ed2710d97387a326b74f1a02236cd0d0
This commit is contained in:
jdlrobson 2017-12-07 11:58:06 -08:00 committed by Jdlrobson
parent c8195e37ef
commit a807fd6fed
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/skins.minerva.scripts/DownloadIcon.js
View file

@ -2,6 +2,7 @@
var msg = mw.msg, var msg = mw.msg,
MAX_PRINT_TIMEOUT = 3000, MAX_PRINT_TIMEOUT = 3000,
GLYPH = 'mf-download',
Icon = M.require( 'mobile.startup/Icon' ); Icon = M.require( 'mobile.startup/Icon' );
/** /**
@ -17,7 +18,7 @@
this.skin = skin; this.skin = skin;
options.tagName = 'li'; options.tagName = 'li';
options.title = msg( 'minerva-download' ); options.title = msg( 'minerva-download' );
options.name = 'download'; options.name = GLYPH;
Icon.call( this, options ); Icon.call( this, options );
} }
@ -33,7 +34,7 @@
* Restore download icon from spinner state * Restore download icon from spinner state
*/ */
hideSpinner: function () { hideSpinner: function () {
this.options.name = 'download'; this.options.name = GLYPH;
this.render(); this.render();
}, },
isTemplateMode: false, isTemplateMode: false,

2
skin.json
View file

@ -168,7 +168,7 @@
"selector": ".mw-ui-icon-{name}:before", "selector": ".mw-ui-icon-{name}:before",
"position": "bottom", "position": "bottom",
"images": { "images": {
"download": "resources/skins.minerva.icons.images.scripts/download.svg", "mf-download": "resources/skins.minerva.icons.images.scripts/download.svg",
"watch": "resources/skins.minerva.icons.images.scripts/watch.svg", "watch": "resources/skins.minerva.icons.images.scripts/watch.svg",
"watched": "resources/skins.minerva.icons.images.scripts/watched.svg", "watched": "resources/skins.minerva.icons.images.scripts/watched.svg",
"user": "resources/skins.minerva.icons.images.scripts/userNormal.svg", "user": "resources/skins.minerva.icons.images.scripts/userNormal.svg",