From a807fd6fed39272b8b0a226ce86001c8f092962a Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 7 Dec 2017 11:58:06 -0800 Subject: [PATCH] Avoid OOUI/download icon nameclash 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 --- resources/skins.minerva.scripts/DownloadIcon.js | 5 +++-- skin.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/skins.minerva.scripts/DownloadIcon.js b/resources/skins.minerva.scripts/DownloadIcon.js index 5f9e3d2..bbaeda2 100644 --- a/resources/skins.minerva.scripts/DownloadIcon.js +++ b/resources/skins.minerva.scripts/DownloadIcon.js @@ -2,6 +2,7 @@ var msg = mw.msg, MAX_PRINT_TIMEOUT = 3000, + GLYPH = 'mf-download', Icon = M.require( 'mobile.startup/Icon' ); /** @@ -17,7 +18,7 @@ this.skin = skin; options.tagName = 'li'; options.title = msg( 'minerva-download' ); - options.name = 'download'; + options.name = GLYPH; Icon.call( this, options ); } @@ -33,7 +34,7 @@ * Restore download icon from spinner state */ hideSpinner: function () { - this.options.name = 'download'; + this.options.name = GLYPH; this.render(); }, isTemplateMode: false, diff --git a/skin.json b/skin.json index 070d5fe..c1758a7 100644 --- a/skin.json +++ b/skin.json @@ -168,7 +168,7 @@ "selector": ".mw-ui-icon-{name}:before", "position": "bottom", "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", "watched": "resources/skins.minerva.icons.images.scripts/watched.svg", "user": "resources/skins.minerva.icons.images.scripts/userNormal.svg",