From daef425ba1a4ec8d12a259a070cc1ee126a82e61 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 25 Apr 2019 10:34:01 +0800 Subject: [PATCH] Minerva is Hogan free All hail Mustache! Change-Id: Iaf83dc27addd00ffd65d003bd5d84441965124e8 Depends-On: If00010e092e3766f9812f9a69ce0dfe22298689a Bug: T220620 --- .../NotificationBadge.js | 2 +- resources/skins.minerva.options/BackToTopOverlay.js | 2 +- ...ackToTopOverlay.hogan => BackToTopOverlay.mustache} | 0 resources/skins.minerva.scripts/menu/MainMenu.js | 4 ++-- .../page-issues/overlay/IssueNotice.js | 2 +- .../{IssueNotice.hogan => IssueNotice.mustache} | 0 skin.json | 10 +++++----- tests/qunit/skins.minerva.scripts/stubs.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename resources/skins.minerva.options/{BackToTopOverlay.hogan => BackToTopOverlay.mustache} (100%) rename resources/skins.minerva.scripts/page-issues/overlay/{IssueNotice.hogan => IssueNotice.mustache} (100%) diff --git a/resources/skins.minerva.notifications.badge/NotificationBadge.js b/resources/skins.minerva.notifications.badge/NotificationBadge.js index f39254f..19df955 100644 --- a/resources/skins.minerva.notifications.badge/NotificationBadge.js +++ b/resources/skins.minerva.notifications.badge/NotificationBadge.js @@ -58,7 +58,7 @@ } mfExtend( NotificationBadge, View, { - template: mw.template.get( 'skins.minerva.notifications.badge', 'badge.hogan' ), + template: mw.template.get( 'skins.minerva.notifications.badge', 'badge.mustache' ), /** * Update the notification count * @memberof NotificationBadge diff --git a/resources/skins.minerva.options/BackToTopOverlay.js b/resources/skins.minerva.options/BackToTopOverlay.js index cc721ff..e21e8a6 100644 --- a/resources/skins.minerva.options/BackToTopOverlay.js +++ b/resources/skins.minerva.options/BackToTopOverlay.js @@ -21,7 +21,7 @@ } mfExtend( BackToTopOverlay, View, { - template: mw.template.get( 'skins.minerva.options', 'BackToTopOverlay.hogan' ), + template: mw.template.get( 'skins.minerva.options', 'BackToTopOverlay.mustache' ), /** * Show the back to top element, if it's not visible already. diff --git a/resources/skins.minerva.options/BackToTopOverlay.hogan b/resources/skins.minerva.options/BackToTopOverlay.mustache similarity index 100% rename from resources/skins.minerva.options/BackToTopOverlay.hogan rename to resources/skins.minerva.options/BackToTopOverlay.mustache diff --git a/resources/skins.minerva.scripts/menu/MainMenu.js b/resources/skins.minerva.scripts/menu/MainMenu.js index 446849f..96137d2 100644 --- a/resources/skins.minerva.scripts/menu/MainMenu.js +++ b/resources/skins.minerva.scripts/menu/MainMenu.js @@ -19,9 +19,9 @@ mfExtend( MainMenu, View, { isTemplateMode: true, - template: mw.template.get( 'skins.minerva.scripts', 'menu.hogan' ), + template: mw.template.get( 'skins.minerva.scripts', 'menu.mustache' ), templatePartials: { - menuGroup: mw.template.get( 'skins.minerva.scripts', 'menuGroup.hogan' ) + menuGroup: mw.template.get( 'skins.minerva.scripts', 'menuGroup.mustache' ) }, /** diff --git a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js index 9b0fca7..cdcaaae 100644 --- a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js +++ b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js @@ -16,7 +16,7 @@ } mfExtend( IssueNotice, View, { tagName: 'li', - template: mw.template.get( 'skins.minerva.scripts', 'IssueNotice.hogan' ), + template: mw.template.get( 'skins.minerva.scripts', 'IssueNotice.mustache' ), postRender: function () { View.prototype.postRender.apply( this, arguments ); this.$el.find( '.issue-notice' ).prepend( this.options.issue.icon.$el ); diff --git a/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.hogan b/resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.mustache similarity index 100% rename from resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.hogan rename to resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.mustache diff --git a/skin.json b/skin.json index 18c1419..9bb2012 100644 --- a/skin.json +++ b/skin.json @@ -460,9 +460,9 @@ "resources/skins.minerva.scripts/page-issues/overlay/PageIssuesOverlay.less" ], "templates": { - "IssueNotice.hogan": "resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.hogan", - "menu.hogan": "resources/skins.minerva.scripts/menu/menu.mustache", - "menuGroup.hogan": "resources/skins.minerva.scripts/menu/menuGroup.mustache" + "IssueNotice.mustache": "resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.mustache", + "menu.mustache": "resources/skins.minerva.scripts/menu/menu.mustache", + "menuGroup.mustache": "resources/skins.minerva.scripts/menu/menuGroup.mustache" }, "scripts": [ "resources/skins.minerva.scripts/menu/schema.js", @@ -503,7 +503,7 @@ "resources/skins.minerva.notifications.badge/NotificationBadge.js" ], "templates": { - "badge.hogan": "includes/skins/secondaryButton.mustache" + "badge.mustache": "includes/skins/secondaryButton.mustache" }, "targets": [ "mobile", @@ -549,7 +549,7 @@ "skin-minerva-share" ], "templates": { - "BackToTopOverlay.hogan": "resources/skins.minerva.options/BackToTopOverlay.hogan" + "BackToTopOverlay.mustache": "resources/skins.minerva.options/BackToTopOverlay.mustache" }, "styles": [ "resources/skins.minerva.options/backtotop.less" diff --git a/tests/qunit/skins.minerva.scripts/stubs.js b/tests/qunit/skins.minerva.scripts/stubs.js index 8c6a7b2..0e5cfc5 100644 --- a/tests/qunit/skins.minerva.scripts/stubs.js +++ b/tests/qunit/skins.minerva.scripts/stubs.js @@ -1,4 +1,4 @@ // Since tests.minerva.scripts does // not pull in the entire module skins.minerva.scripts // we have to stub certain templates to make it appear like its been loaded. -mw.template.add( 'skins.minerva.scripts', 'IssueNotice.hogan', '' ); +mw.template.add( 'skins.minerva.scripts', 'IssueNotice.mustache', '' );