Merge "Minerva is Hogan free"

This commit is contained in:
jenkins-bot 2019-05-01 19:41:39 +00:00 committed by Gerrit Code Review
commit dcf2d589a3
8 changed files with 11 additions and 11 deletions

View File

@ -58,7 +58,7 @@
} }
mfExtend( NotificationBadge, View, { 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 * Update the notification count
* @memberof NotificationBadge * @memberof NotificationBadge

View File

@ -21,7 +21,7 @@
} }
mfExtend( BackToTopOverlay, View, { 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. * Show the back to top element, if it's not visible already.

View File

@ -19,9 +19,9 @@
mfExtend( MainMenu, View, { mfExtend( MainMenu, View, {
isTemplateMode: true, isTemplateMode: true,
template: mw.template.get( 'skins.minerva.scripts', 'menu.hogan' ), template: mw.template.get( 'skins.minerva.scripts', 'menu.mustache' ),
templatePartials: { templatePartials: {
menuGroup: mw.template.get( 'skins.minerva.scripts', 'menuGroup.hogan' ) menuGroup: mw.template.get( 'skins.minerva.scripts', 'menuGroup.mustache' )
}, },
/** /**

View File

@ -16,7 +16,7 @@
} }
mfExtend( IssueNotice, View, { mfExtend( IssueNotice, View, {
tagName: 'li', tagName: 'li',
template: mw.template.get( 'skins.minerva.scripts', 'IssueNotice.hogan' ), template: mw.template.get( 'skins.minerva.scripts', 'IssueNotice.mustache' ),
postRender: function () { postRender: function () {
View.prototype.postRender.apply( this, arguments ); View.prototype.postRender.apply( this, arguments );
this.$el.find( '.issue-notice' ).prepend( this.options.issue.icon.$el ); this.$el.find( '.issue-notice' ).prepend( this.options.issue.icon.$el );

View File

@ -460,9 +460,9 @@
"resources/skins.minerva.scripts/page-issues/overlay/PageIssuesOverlay.less" "resources/skins.minerva.scripts/page-issues/overlay/PageIssuesOverlay.less"
], ],
"templates": { "templates": {
"IssueNotice.hogan": "resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.hogan", "IssueNotice.mustache": "resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.mustache",
"menu.hogan": "resources/skins.minerva.scripts/menu/menu.mustache", "menu.mustache": "resources/skins.minerva.scripts/menu/menu.mustache",
"menuGroup.hogan": "resources/skins.minerva.scripts/menu/menuGroup.mustache" "menuGroup.mustache": "resources/skins.minerva.scripts/menu/menuGroup.mustache"
}, },
"scripts": [ "scripts": [
"resources/skins.minerva.scripts/menu/schema.js", "resources/skins.minerva.scripts/menu/schema.js",
@ -503,7 +503,7 @@
"resources/skins.minerva.notifications.badge/NotificationBadge.js" "resources/skins.minerva.notifications.badge/NotificationBadge.js"
], ],
"templates": { "templates": {
"badge.hogan": "includes/skins/secondaryButton.mustache" "badge.mustache": "includes/skins/secondaryButton.mustache"
}, },
"targets": [ "targets": [
"mobile", "mobile",
@ -549,7 +549,7 @@
"skin-minerva-share" "skin-minerva-share"
], ],
"templates": { "templates": {
"BackToTopOverlay.hogan": "resources/skins.minerva.options/BackToTopOverlay.hogan" "BackToTopOverlay.mustache": "resources/skins.minerva.options/BackToTopOverlay.mustache"
}, },
"styles": [ "styles": [
"resources/skins.minerva.options/backtotop.less" "resources/skins.minerva.options/backtotop.less"

View File

@ -1,4 +1,4 @@
// Since tests.minerva.scripts does // Since tests.minerva.scripts does
// not pull in the entire module skins.minerva.scripts // not pull in the entire module skins.minerva.scripts
// we have to stub certain templates to make it appear like its been loaded. // 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', '' );