jenkins-bot has submitted this change and it was merged.
Change subject: Explicitly name template languages
......................................................................
Explicitly name template languages
Flow boards have the odd property of having hogan templates
and handlebars templates.
We have some hacky code in Mantle that deals with this currently,
but let's remove this by making things explicit
See: Iab1c1a9025bd3e1e3d3a2bb5625adbdb6f7fddd2
Change-Id: Icb9352e422dc105ac769bbe0db7e5525895204c7
---
M includes/Resources.php
M javascripts/common/CtaDrawer.js
M javascripts/common/LoadingOverlay.js
M javascripts/common/Overlay.js
M javascripts/common/Page.js
M javascripts/common/Section.js
M javascripts/common/View.js
M javascripts/modules/PageList.js
M javascripts/modules/editor/AbuseFilterOverlay.js
M javascripts/modules/editor/AbuseFilterPanel.js
M javascripts/modules/editor/EditorOverlay.js
M javascripts/modules/editor/EditorOverlayBase.js
M javascripts/modules/editor/VisualEditorOverlay.js
M javascripts/modules/issues/issues.js
M javascripts/modules/languages/LanguageOverlay.js
M javascripts/modules/mediaViewer/ImageOverlay.js
M javascripts/modules/nearby/NearbyOverlay.js
M javascripts/modules/nearby/PagePreviewOverlay.js
M javascripts/modules/notifications/NotificationsOverlay.js
M javascripts/modules/references/references.js
M javascripts/modules/search/SearchOverlay.js
M javascripts/modules/talk/TalkOverlay.js
M javascripts/modules/talk/TalkSectionAddOverlay.js
M javascripts/modules/talk/TalkSectionOverlay.js
M javascripts/modules/toc/toc.js
M javascripts/modules/tutorials/PageActionOverlay.js
M javascripts/modules/uploads/LeadPhoto.js
M javascripts/modules/uploads/LeadPhotoUploaderButton.js
M javascripts/modules/uploads/PhotoApi.js
M javascripts/modules/uploads/PhotoUploadOverlay.js
M javascripts/modules/uploads/PhotoUploadProgress.js
M javascripts/modules/uploads/PhotoUploaderButton.js
M javascripts/modules/uploads/UploadTutorial.js
M javascripts/specials/mobileoptions.js
M javascripts/specials/uploads.js
M javascripts/widgets/progress-bar.js
R templates/LoadingOverlay.hogan
R templates/Overlay.hogan
R templates/ReferencesDrawer.hogan
R templates/articleList.hogan
R templates/ctaDrawer.hogan
R templates/modules/ImageOverlay.hogan
R templates/modules/editor/AbuseFilterOverlay.hogan
R templates/modules/editor/AbuseFilterPanel.hogan
R templates/modules/editor/EditorOverlay.hogan
R templates/modules/editor/EditorOverlayBase.hogan
R templates/modules/editor/EditorOverlayHeader.hogan
R templates/modules/editor/VisualEditorOverlay.hogan
R templates/modules/editor/VisualEditorOverlayHeader.hogan
R templates/modules/languages/LanguageOverlay.hogan
R templates/modules/notifications/NotificationsOverlayContent.hogan
R templates/modules/notifications/NotificationsOverlayFooter.hogan
R templates/modules/search/SearchOverlay.hogan
R templates/modules/toc/toc.hogan
R templates/modules/toc/tocHeading.hogan
R templates/modules/tutorials/PageActionOverlay.hogan
R templates/overlays/cleanup.hogan
R templates/overlays/nearby.hogan
R templates/overlays/pagePreview.hogan
R templates/overlays/talk.hogan
R templates/overlays/talkSectionAdd.hogan
R templates/page.hogan
R templates/section.hogan
R templates/specials/mobileoptions/checkbox.hogan
R templates/specials/uploads/photo.hogan
R templates/specials/uploads/userGallery.hogan
R templates/talkSection.hogan
R templates/uploads/LeadPhoto.hogan
R templates/uploads/LeadPhotoUploaderButton.hogan
R templates/uploads/PhotoUploadOverlay.hogan
R templates/uploads/PhotoUploadProgress.hogan
R templates/uploads/PhotoUploaderButton.hogan
R templates/uploads/UploadTutorial.hogan
R templates/wikitext/commons-upload.hogan
M tests/qunit/common/test_Overlay.js
M tests/qunit/common/test_View.js
76 files changed, 84 insertions(+), 85 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index f4b4a8f..05e2798 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -99,8 +99,8 @@
'less/modules/toc/toc.less',
),
'templates' => array(
- 'modules/toc/toc',
- 'modules/toc/tocHeading'
+ 'modules/toc/toc.hogan',
+ 'modules/toc/tocHeading.hogan'
),
'messages' => array(
'toc'
@@ -186,8 +186,8 @@
'mobile.redlinks',
),
'templates' => array(
- 'page',
- 'section',
+ 'page.hogan',
+ 'section.hogan',
),
'messages' => array(
'mobile-frontend-language-article-heading',
@@ -247,8 +247,8 @@
'javascripts/modules/editor/AbuseFilterPanel.js',
),
'templates' => array(
- 'modules/editor/AbuseFilterOverlay',
- 'modules/editor/AbuseFilterPanel',
+ 'modules/editor/AbuseFilterOverlay.hogan',
+ 'modules/editor/AbuseFilterPanel.hogan',
),
'messages' => array(
// AbuseFilterOverlay
@@ -274,7 +274,7 @@
'less/modules/editor/editor.less',
),
'templates' => array(
- 'modules/editor/EditorOverlayBase',
+ 'modules/editor/EditorOverlayBase.hogan',
),
'messages' => array(
// modules/editor/EditorOverlay.js
@@ -323,8 +323,8 @@
'javascripts/modules/editor/VisualEditorOverlay.js',
),
'templates' => array(
- 'modules/editor/VisualEditorOverlayHeader',
- 'modules/editor/VisualEditorOverlay',
+ 'modules/editor/VisualEditorOverlayHeader.hogan',
+ 'modules/editor/VisualEditorOverlay.hogan',
),
'messages' => array(
'mobile-frontend-page-edit-summary',
@@ -341,8 +341,8 @@
'javascripts/modules/editor/EditorOverlay.js',
),
'templates' => array(
- 'modules/editor/EditorOverlayHeader',
- 'modules/editor/EditorOverlay',
+ 'modules/editor/EditorOverlayHeader.hogan',
+ 'modules/editor/EditorOverlay.hogan',
),
'messages' => array(
'mobile-frontend-editor-viewing-source-page',
@@ -370,10 +370,10 @@
'less/modules/uploads/PhotoUploadOverlay.less',
),
'templates' => array(
- 'uploads/LeadPhoto',
- 'uploads/UploadTutorial',
- 'uploads/PhotoUploadOverlay',
- 'uploads/PhotoUploadProgress',
+ 'uploads/LeadPhoto.hogan',
+ 'uploads/UploadTutorial.hogan',
+ 'uploads/PhotoUploadOverlay.hogan',
+ 'uploads/PhotoUploadProgress.hogan',
),
'messages' => array(
'mobile-frontend-photo-upload-success-article',
@@ -481,7 +481,7 @@
'javascripts/modules/search/pageImages.js',
),
'templates' => array(
- 'modules/search/SearchOverlay',
+ 'modules/search/SearchOverlay.hogan',
),
'messages' => array(
// for search.js
@@ -511,9 +511,9 @@
),
'templates' => array(
// talk.js
- 'overlays/talk',
- 'overlays/talkSectionAdd',
- 'talkSection',
+ 'overlays/talk.hogan',
+ 'overlays/talkSectionAdd.hogan',
+ 'talkSection.hogan',
),
'messages' => array(
'mobile-frontend-talk-explained',
@@ -561,7 +561,7 @@
'javascripts/modules/mediaViewer/ImageOverlay.js',
),
'templates' => array(
- 'modules/ImageOverlay',
+ 'modules/ImageOverlay.hogan',
),
'messages' => array(
// mediaViewer.js
@@ -610,8 +610,8 @@
'mobile-frontend-overlay-continue',
),
'templates' => array(
- 'Overlay',
- 'LoadingOverlay',
+ 'Overlay.hogan',
+ 'LoadingOverlay.hogan',
),
'styles' => array(
'less/common/Overlay.less',
@@ -629,17 +629,17 @@
'mobile.overlays',
),
'templates' => array(
- 'wikitext/commons-upload',
+ 'wikitext/commons-upload.hogan',
// SearchOverlay.js and Nearby.js
- 'articleList',
+ 'articleList.hogan',
// PhotoUploaderButton.js
// For new page action menu
- 'uploads/LeadPhotoUploaderButton',
+ 'uploads/LeadPhotoUploaderButton.hogan',
// @todo FIXME: this should be in special.uploads (need
to split
// code in PhotoUploaderButton.js into separate files
too)
- 'uploads/PhotoUploaderButton',
+ 'uploads/PhotoUploaderButton.hogan',
- 'ctaDrawer',
+ 'ctaDrawer.hogan',
),
'scripts' => array(
'javascripts/modules/routes.js',
@@ -692,7 +692,7 @@
),
'templates' => array(
// references.js
- 'ReferencesDrawer',
+ 'ReferencesDrawer.hogan',
),
'scripts' => array(
'javascripts/modules/references/references.js',
@@ -720,7 +720,7 @@
'javascripts/modules/tutorials/PageActionOverlay.js',
),
'templates' => array(
- 'modules/tutorials/PageActionOverlay',
+ 'modules/tutorials/PageActionOverlay.hogan',
),
),
@@ -811,7 +811,7 @@
'javascripts/modules/languages/languages.js',
),
'templates' => array(
- 'modules/languages/LanguageOverlay',
+ 'modules/languages/LanguageOverlay.hogan',
),
'messages' => array(
'mobile-frontend-language-heading',
@@ -826,7 +826,7 @@
'mobile.overlays',
),
'templates' => array(
- 'overlays/cleanup',
+ 'overlays/cleanup.hogan',
),
'styles' => array(
'less/modules/issues.less',
@@ -843,7 +843,7 @@
'mobile.nearby' => $wgMFMobileResourceBoilerplate + array(
'templates' => array(
- 'overlays/pagePreview',
+ 'overlays/pagePreview.hogan',
),
'dependencies' => array(
'mobile.stable.common',
@@ -899,8 +899,8 @@
'less/modules/NotificationsOverlay.less',
),
'templates' => array(
- 'modules/notifications/NotificationsOverlayContent',
- 'modules/notifications/NotificationsOverlayFooter',
+
'modules/notifications/NotificationsOverlayContent.hogan',
+
'modules/notifications/NotificationsOverlayFooter.hogan',
),
'messages' => array(
// defined in Echo
@@ -979,7 +979,7 @@
'javascripts/specials/mobileoptions.js',
),
'templates' => array(
- 'specials/mobileoptions/checkbox',
+ 'specials/mobileoptions/checkbox.hogan',
),
'messages' => array(
'mobile-frontend-off',
@@ -1016,7 +1016,7 @@
'mobile-frontend-nearby-link',
),
'templates' => array(
- 'overlays/nearby',
+ 'overlays/nearby.hogan',
),
'dependencies' => array(
'mobile.stable.common',
@@ -1075,8 +1075,8 @@
'mobile.stable'
),
'templates' => array(
- 'specials/uploads/photo',
- 'specials/uploads/userGallery',
+ 'specials/uploads/photo.hogan',
+ 'specials/uploads/userGallery.hogan',
),
'messages' => array(
'mobile-frontend-donate-image-nouploads',
diff --git a/javascripts/common/CtaDrawer.js b/javascripts/common/CtaDrawer.js
index a98221d..0b1f9fa 100644
--- a/javascripts/common/CtaDrawer.js
+++ b/javascripts/common/CtaDrawer.js
@@ -14,7 +14,7 @@
loginCaption: mw.msg(
'mobile-frontend-watchlist-cta-button-login' ),
signupCaption: mw.msg(
'mobile-frontend-watchlist-cta-button-signup' )
},
- template: M.template.get( 'ctaDrawer' ),
+ template: M.template.get( 'ctaDrawer.hogan' ),
preRender: function( options ) {
var params = $.extend( {
diff --git a/javascripts/common/LoadingOverlay.js
b/javascripts/common/LoadingOverlay.js
index e7f2e86..4221b11 100644
--- a/javascripts/common/LoadingOverlay.js
+++ b/javascripts/common/LoadingOverlay.js
@@ -6,7 +6,7 @@
* @extends Overlay
*/
LoadingOverlay = Overlay.extend( {
- template: M.template.get( 'LoadingOverlay' )
+ template: M.template.get( 'LoadingOverlay.hogan' )
} );
M.define( 'LoadingOverlay', LoadingOverlay );
diff --git a/javascripts/common/Overlay.js b/javascripts/common/Overlay.js
index 052c962..c26b1da 100644
--- a/javascripts/common/Overlay.js
+++ b/javascripts/common/Overlay.js
@@ -32,7 +32,7 @@
* @type {String}
*/
className: 'overlay',
- template: M.template.get( 'Overlay' ),
+ template: M.template.get( 'Overlay.hogan' ),
defaults: {
headerButtonsListClassName: '',
closeMsg: mw.msg( 'mobile-frontend-overlay-close' ),
diff --git a/javascripts/common/Page.js b/javascripts/common/Page.js
index c5c5260..3920779 100644
--- a/javascripts/common/Page.js
+++ b/javascripts/common/Page.js
@@ -10,7 +10,7 @@
* @extends View
*/
Page = View.extend( {
- template: M.template.get( 'page' ),
+ template: M.template.get( 'page.hogan' ),
defaults: {
// id defaults to 0 which represents a new page. Be
sure to override to avoid side effects.
id: 0,
diff --git a/javascripts/common/Section.js b/javascripts/common/Section.js
index e90cd77..1f51be9 100644
--- a/javascripts/common/Section.js
+++ b/javascripts/common/Section.js
@@ -9,7 +9,7 @@
* @extends View
*/
Section = View.extend( {
- template: M.template.get( 'section' ),
+ template: M.template.get( 'section.hogan' ),
defaults: {
line: '',
text: '',
diff --git a/javascripts/common/View.js b/javascripts/common/View.js
index 273707d..cb2584d 100644
--- a/javascripts/common/View.js
+++ b/javascripts/common/View.js
@@ -67,8 +67,8 @@
* // {{>content}}
*
* var SomeView = View.extend( {
- * template: M.template.get( 'some' ),
- * templatePartials: { content: M.template.get( 'sub' ) }
+ * template: M.template.get( 'some.hogan' ),
+ * templatePartials: { content: M.template.get( 'sub.hogan'
) }
* }
*
* @type {Object}
diff --git a/javascripts/modules/PageList.js b/javascripts/modules/PageList.js
index 7a3821d..0d63a2b 100644
--- a/javascripts/modules/PageList.js
+++ b/javascripts/modules/PageList.js
@@ -21,7 +21,7 @@
this.api = new WatchstarApi( options );
this._super( options );
},
- template: M.template.get( 'articleList' ),
+ template: M.template.get( 'articleList.hogan' ),
postRender: function( options ) {
this._super( options );
var pages = [], $li = this.$( 'li' ),
diff --git a/javascripts/modules/editor/AbuseFilterOverlay.js
b/javascripts/modules/editor/AbuseFilterOverlay.js
index 0f6a85a..76e1ebe 100644
--- a/javascripts/modules/editor/AbuseFilterOverlay.js
+++ b/javascripts/modules/editor/AbuseFilterOverlay.js
@@ -5,7 +5,7 @@
confirmMessage: mw.msg(
'mobile-frontend-photo-ownership-confirm' )
},
templatePartials: {
- content: M.template.get(
'modules/editor/AbuseFilterOverlay' )
+ content: M.template.get(
'modules/editor/AbuseFilterOverlay.hogan' )
},
className: 'overlay abusefilter-overlay',
diff --git a/javascripts/modules/editor/AbuseFilterPanel.js
b/javascripts/modules/editor/AbuseFilterPanel.js
index 05e7f67..2d3d74d 100644
--- a/javascripts/modules/editor/AbuseFilterPanel.js
+++ b/javascripts/modules/editor/AbuseFilterPanel.js
@@ -8,7 +8,7 @@
defaults: {
readMoreMsg: mw.msg(
'mobile-frontend-editor-abusefilter-read-more')
},
- template: M.template.get( 'modules/editor/AbuseFilterPanel' ),
+ template: M.template.get(
'modules/editor/AbuseFilterPanel.hogan' ),
className: 'panel hidden',
initialize: function() {
diff --git a/javascripts/modules/editor/EditorOverlay.js
b/javascripts/modules/editor/EditorOverlay.js
index 248cc56..bbcb3a7 100644
--- a/javascripts/modules/editor/EditorOverlay.js
+++ b/javascripts/modules/editor/EditorOverlay.js
@@ -19,8 +19,8 @@
*/
EditorOverlay = EditorOverlayBase.extend( {
templatePartials: {
- header: M.template.get(
'modules/editor/EditorOverlayHeader' ),
- content: M.template.get( 'modules/editor/EditorOverlay'
)
+ header: M.template.get(
'modules/editor/EditorOverlayHeader.hogan' ),
+ content: M.template.get(
'modules/editor/EditorOverlay.hogan' )
},
editor: 'SourceEditor',
diff --git a/javascripts/modules/editor/EditorOverlayBase.js
b/javascripts/modules/editor/EditorOverlayBase.js
index 4261f8f..bc650fa 100644
--- a/javascripts/modules/editor/EditorOverlayBase.js
+++ b/javascripts/modules/editor/EditorOverlayBase.js
@@ -26,7 +26,7 @@
visualEditorMsg: mw.msg(
'mobile-frontend-editor-visual-editor' ),
sourceEditorMsg: mw.msg(
'mobile-frontend-editor-source-editor' ),
},
- template: M.template.get( 'modules/editor/EditorOverlayBase' ),
+ template: M.template.get(
'modules/editor/EditorOverlayBase.hogan' ),
className: 'overlay editor-overlay',
log: function( action, errorText ) {
var
diff --git a/javascripts/modules/editor/VisualEditorOverlay.js
b/javascripts/modules/editor/VisualEditorOverlay.js
index f18fdde..6e838fd 100644
--- a/javascripts/modules/editor/VisualEditorOverlay.js
+++ b/javascripts/modules/editor/VisualEditorOverlay.js
@@ -8,8 +8,8 @@
*/
VisualEditorOverlay = EditorOverlayBase.extend( {
templatePartials: {
- header: M.template.get(
'modules/editor/VisualEditorOverlayHeader' ),
- content: M.template.get(
'modules/editor/VisualEditorOverlay' )
+ header: M.template.get(
'modules/editor/VisualEditorOverlayHeader.hogan' ),
+ content: M.template.get(
'modules/editor/VisualEditorOverlay.hogan' )
},
className: 'overlay editor-overlay editor-overlay-ve',
editor: 'VisualEditor',
diff --git a/javascripts/modules/issues/issues.js
b/javascripts/modules/issues/issues.js
index 190ca6b..a75d27a 100644
--- a/javascripts/modules/issues/issues.js
+++ b/javascripts/modules/issues/issues.js
@@ -9,7 +9,7 @@
heading: '<strong>' + mw.msg(
'mobile-frontend-meta-data-issues-header' ) + '</strong>'
} ),
templatePartials: {
- content: M.template.get( 'overlays/cleanup' )
+ content: M.template.get(
'overlays/cleanup.hogan' )
}
} );
diff --git a/javascripts/modules/languages/LanguageOverlay.js
b/javascripts/modules/languages/LanguageOverlay.js
index 32ab8ce..6512d98 100644
--- a/javascripts/modules/languages/LanguageOverlay.js
+++ b/javascripts/modules/languages/LanguageOverlay.js
@@ -10,7 +10,7 @@
},
className: 'language-overlay overlay',
templatePartials: {
- content: M.template.get(
'modules/languages/LanguageOverlay' )
+ content: M.template.get(
'modules/languages/LanguageOverlay.hogan' )
},
initialize: function( options ) {
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 2efa4bc..43362f1 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -12,7 +12,7 @@
*/
ImageOverlay = Overlay.extend( {
className: 'overlay media-viewer',
- template: M.template.get( 'modules/ImageOverlay' ),
+ template: M.template.get( 'modules/ImageOverlay.hogan' ),
closeOnBack: true,
defaults: {
diff --git a/javascripts/modules/nearby/NearbyOverlay.js
b/javascripts/modules/nearby/NearbyOverlay.js
index 5262459..81770f5 100644
--- a/javascripts/modules/nearby/NearbyOverlay.js
+++ b/javascripts/modules/nearby/NearbyOverlay.js
@@ -11,7 +11,7 @@
active: false,
closeOnBack: true,
templatePartials: {
- content: M.template.get( 'overlays/nearby' )
+ content: M.template.get(
'overlays/nearby.hogan' )
},
defaults: {
heading: mw.message(
'mobile-frontend-nearby-title' )
diff --git a/javascripts/modules/nearby/PagePreviewOverlay.js
b/javascripts/modules/nearby/PagePreviewOverlay.js
index 11d8271..af75235 100644
--- a/javascripts/modules/nearby/PagePreviewOverlay.js
+++ b/javascripts/modules/nearby/PagePreviewOverlay.js
@@ -16,7 +16,7 @@
source: 'nearby'
},
templatePartials: {
- content: M.template.get( 'overlays/pagePreview'
)
+ content: M.template.get(
'overlays/pagePreview.hogan' )
},
initialize: function( options ) {
var self = this, loader = new LoadingOverlay(),
diff --git a/javascripts/modules/notifications/NotificationsOverlay.js
b/javascripts/modules/notifications/NotificationsOverlay.js
index e643be4..62f49e0 100644
--- a/javascripts/modules/notifications/NotificationsOverlay.js
+++ b/javascripts/modules/notifications/NotificationsOverlay.js
@@ -11,8 +11,8 @@
active: false,
className: 'overlay notifications-overlay
navigation-drawer',
templatePartials: {
- content: M.template.get(
'modules/notifications/NotificationsOverlayContent' ),
- footer: M.template.get(
'modules/notifications/NotificationsOverlayFooter' )
+ content: M.template.get(
'modules/notifications/NotificationsOverlayContent.hogan' ),
+ footer: M.template.get(
'modules/notifications/NotificationsOverlayFooter.hogan' )
},
defaults: {
heading: mw.msg( 'notifications' ),
diff --git a/javascripts/modules/references/references.js
b/javascripts/modules/references/references.js
index 54334a8..725c785 100644
--- a/javascripts/modules/references/references.js
+++ b/javascripts/modules/references/references.js
@@ -3,7 +3,7 @@
ReferencesDrawer = Drawer.extend( {
className: 'drawer position-fixed text references',
- template: M.template.get( 'ReferencesDrawer' )
+ template: M.template.get( 'ReferencesDrawer.hogan' )
} );
function getReference( id ) {
diff --git a/javascripts/modules/search/SearchOverlay.js
b/javascripts/modules/search/SearchOverlay.js
index bda3129..99633b5 100644
--- a/javascripts/modules/search/SearchOverlay.js
+++ b/javascripts/modules/search/SearchOverlay.js
@@ -9,7 +9,7 @@
SearchOverlay = Overlay.extend( {
className: 'overlay search-overlay',
- template: M.template.get( 'modules/search/SearchOverlay' ),
+ template: M.template.get( 'modules/search/SearchOverlay.hogan'
),
defaults: {
placeholderMsg: $( '#searchInput' ).attr( 'placeholder'
),
clearMsg: mw.msg( 'mobile-frontend-clear-search' ),
diff --git a/javascripts/modules/talk/TalkOverlay.js
b/javascripts/modules/talk/TalkOverlay.js
index 4df296e..ad7ecb6 100644
--- a/javascripts/modules/talk/TalkOverlay.js
+++ b/javascripts/modules/talk/TalkOverlay.js
@@ -10,7 +10,7 @@
user = M.require( 'user' ),
TalkOverlay = Overlay.extend( {
templatePartials: {
- content: M.template.get( 'overlays/talk' )
+ content: M.template.get( 'overlays/talk.hogan' )
},
defaults: {
addTopicLabel: mw.msg(
'mobile-frontend-talk-add-overlay-submit' ),
diff --git a/javascripts/modules/talk/TalkSectionAddOverlay.js
b/javascripts/modules/talk/TalkSectionAddOverlay.js
index 0129d2e..f4b793c 100644
--- a/javascripts/modules/talk/TalkSectionAddOverlay.js
+++ b/javascripts/modules/talk/TalkSectionAddOverlay.js
@@ -18,7 +18,7 @@
topicContentPlaceHolder: mw.msg(
'mobile-frontend-talk-add-overlay-content-placeholder' )
},
templatePartials: {
- content: M.template.get( 'overlays/talkSectionAdd' )
+ content: M.template.get(
'overlays/talkSectionAdd.hogan' )
},
initialize: function( options ) {
// If terms of use is enabled, include it in the
licensing message
diff --git a/javascripts/modules/talk/TalkSectionOverlay.js
b/javascripts/modules/talk/TalkSectionOverlay.js
index e009667..b68c0e6 100644
--- a/javascripts/modules/talk/TalkSectionOverlay.js
+++ b/javascripts/modules/talk/TalkSectionOverlay.js
@@ -6,7 +6,7 @@
user = M.require( 'user' ),
TalkSectionOverlay = Overlay.extend( {
templatePartials: {
- content: M.template.get( 'talkSection' )
+ content: M.template.get( 'talkSection.hogan' )
},
defaults: {
reply: mw.msg( 'mobile-frontend-talk-reply' ),
diff --git a/javascripts/modules/toc/toc.js b/javascripts/modules/toc/toc.js
index 438cb06..1122a50 100644
--- a/javascripts/modules/toc/toc.js
+++ b/javascripts/modules/toc/toc.js
@@ -5,14 +5,14 @@
TableOfContents = View.extend( {
templatePartials: {
- tocHeading: M.template.get( 'modules/toc/tocHeading' )
+ tocHeading: M.template.get(
'modules/toc/tocHeading.hogan' )
},
defaults: {
contentsMsg: mw.msg( 'toc' )
},
tagName: 'div',
className: 'toc-mobile',
- template: M.template.get( 'modules/toc/toc' ),
+ template: M.template.get( 'modules/toc/toc.hogan' ),
postRender: function( options ) {
var log = MobileWebClickTracking.log;
this._super( options );
diff --git a/javascripts/modules/tutorials/PageActionOverlay.js
b/javascripts/modules/tutorials/PageActionOverlay.js
index 4f6c2f4..2d97e76 100644
--- a/javascripts/modules/tutorials/PageActionOverlay.js
+++ b/javascripts/modules/tutorials/PageActionOverlay.js
@@ -7,7 +7,7 @@
* @extends ContentOverlay
*/
PageActionOverlay = ContentOverlay.extend( {
- template: M.template.get( 'modules/tutorials/PageActionOverlay'
),
+ template: M.template.get(
'modules/tutorials/PageActionOverlay.hogan' ),
defaults: {
cancelMsg: mw.msg( 'cancel' )
}
diff --git a/javascripts/modules/uploads/LeadPhoto.js
b/javascripts/modules/uploads/LeadPhoto.js
index 5d01ca1..035d546 100644
--- a/javascripts/modules/uploads/LeadPhoto.js
+++ b/javascripts/modules/uploads/LeadPhoto.js
@@ -3,7 +3,7 @@
var View = M.require( 'View' ), LeadPhoto;
LeadPhoto = View.extend( {
- template: M.template.get( 'uploads/LeadPhoto' ),
+ template: M.template.get( 'uploads/LeadPhoto.hogan' ),
animate: function() {
this.$el.hide().slideDown();
diff --git a/javascripts/modules/uploads/LeadPhotoUploaderButton.js
b/javascripts/modules/uploads/LeadPhotoUploaderButton.js
index 9193b6b..699322e 100644
--- a/javascripts/modules/uploads/LeadPhotoUploaderButton.js
+++ b/javascripts/modules/uploads/LeadPhotoUploaderButton.js
@@ -4,7 +4,7 @@
LeadPhotoUploaderButton;
LeadPhotoUploaderButton = PhotoUploaderButton.extend( {
- template: M.template.get( 'uploads/LeadPhotoUploaderButton' ),
+ template: M.template.get(
'uploads/LeadPhotoUploaderButton.hogan' ),
className: 'enabled',
defaults: {
diff --git a/javascripts/modules/uploads/PhotoApi.js
b/javascripts/modules/uploads/PhotoApi.js
index d2e0b3a..bb3268c 100644
--- a/javascripts/modules/uploads/PhotoApi.js
+++ b/javascripts/modules/uploads/PhotoApi.js
@@ -157,7 +157,7 @@
comment: mw.msg(
options.editSummaryMessage ),
file: options.file,
token: token,
- text: M.template.get(
'wikitext/commons-upload' ).
+ text: M.template.get(
'wikitext/commons-upload.hogan' ).
render( {
suffix: mw.config.get(
'wgMFPhotoUploadAppendToDesc' ),
text:
options.description,
diff --git a/javascripts/modules/uploads/PhotoUploadOverlay.js
b/javascripts/modules/uploads/PhotoUploadOverlay.js
index 3d734c6..b1494f7 100644
--- a/javascripts/modules/uploads/PhotoUploadOverlay.js
+++ b/javascripts/modules/uploads/PhotoUploadOverlay.js
@@ -30,7 +30,7 @@
className: 'overlay photo-overlay',
templatePartials: {
- content: M.template.get( 'uploads/PhotoUploadOverlay' )
+ content: M.template.get(
'uploads/PhotoUploadOverlay.hogan' )
},
initialize: function( options ) {
diff --git a/javascripts/modules/uploads/PhotoUploadProgress.js
b/javascripts/modules/uploads/PhotoUploadProgress.js
index 6dd410e..d1b17fb 100644
--- a/javascripts/modules/uploads/PhotoUploadProgress.js
+++ b/javascripts/modules/uploads/PhotoUploadProgress.js
@@ -9,7 +9,7 @@
uploadingMsg: mw.msg( 'mobile-frontend-image-uploading'
),
saveMsg: mw.msg( 'mobile-frontend-editor-save' )
},
- template: M.template.get( 'uploads/PhotoUploadProgress' ),
+ template: M.template.get( 'uploads/PhotoUploadProgress.hogan' ),
fullScreen: false,
initialize: function( options ) {
diff --git a/javascripts/modules/uploads/PhotoUploaderButton.js
b/javascripts/modules/uploads/PhotoUploaderButton.js
index 79ff271..e8f3651 100644
--- a/javascripts/modules/uploads/PhotoUploaderButton.js
+++ b/javascripts/modules/uploads/PhotoUploaderButton.js
@@ -44,7 +44,7 @@
* @param {string} options.funnel Funnel for EventLogging.
*/
PhotoUploaderButton = View.extend( {
- template: M.template.get( 'uploads/PhotoUploaderButton' ),
+ template: M.template.get( 'uploads/PhotoUploaderButton.hogan' ),
className: 'mw-ui-progressive mw-ui-button button icon-photo
icon icon-text',
postRender: function() {
diff --git a/javascripts/modules/uploads/UploadTutorial.js
b/javascripts/modules/uploads/UploadTutorial.js
index 5ce93c5..836e49f 100644
--- a/javascripts/modules/uploads/UploadTutorial.js
+++ b/javascripts/modules/uploads/UploadTutorial.js
@@ -7,7 +7,7 @@
UploadTutorial;
UploadTutorial = Overlay.extend( {
- template: M.template.get( 'uploads/UploadTutorial' ),
+ template: M.template.get( 'uploads/UploadTutorial.hogan' ),
className: 'overlay carousel tutorial',
defaults: {
diff --git a/javascripts/specials/mobileoptions.js
b/javascripts/specials/mobileoptions.js
index 8d34ebb..7668fa0 100644
--- a/javascripts/specials/mobileoptions.js
+++ b/javascripts/specials/mobileoptions.js
@@ -31,7 +31,7 @@
}
Checkbox = View.extend( {
- template: M.template.get( 'specials/mobileoptions/checkbox' ),
+ template: M.template.get(
'specials/mobileoptions/checkbox.hogan' ),
tagName: 'li',
defaults: {
onMsg: mw.msg( 'mobile-frontend-on' ),
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
index a4af3d5..079c420 100644
--- a/javascripts/specials/uploads.js
+++ b/javascripts/specials/uploads.js
@@ -63,12 +63,12 @@
} );
PhotoItem = View.extend( {
- template: M.template.get( 'specials/uploads/photo' ),
+ template: M.template.get( 'specials/uploads/photo.hogan' ),
tagName: 'li'
} );
PhotoList = View.extend( {
- template: M.template.get( 'specials/uploads/userGallery' ),
+ template: M.template.get( 'specials/uploads/userGallery.hogan'
),
initialize: function() {
// how close a spinner needs to be to the viewport to
trigger loading (px)
this.threshold = 1000;
diff --git a/javascripts/widgets/progress-bar.js
b/javascripts/widgets/progress-bar.js
index ad64dec..ecee915 100644
--- a/javascripts/widgets/progress-bar.js
+++ b/javascripts/widgets/progress-bar.js
@@ -5,7 +5,7 @@
ProgressBar = View.extend( {
className: 'progress-bar',
- template: '<div class="value"></div>',
+ template: M.template.compile( '<div class="value"></div>',
'hogan' ),
setValue: function( value ) {
this.$( '.value' ).css( 'width', value * 100 + '%' );
diff --git a/templates/LoadingOverlay.html b/templates/LoadingOverlay.hogan
similarity index 100%
rename from templates/LoadingOverlay.html
rename to templates/LoadingOverlay.hogan
diff --git a/templates/Overlay.html b/templates/Overlay.hogan
similarity index 100%
rename from templates/Overlay.html
rename to templates/Overlay.hogan
diff --git a/templates/ReferencesDrawer.html b/templates/ReferencesDrawer.hogan
similarity index 98%
rename from templates/ReferencesDrawer.html
rename to templates/ReferencesDrawer.hogan
index cb6249f..ea30d12 100644
--- a/templates/ReferencesDrawer.html
+++ b/templates/ReferencesDrawer.hogan
@@ -1,4 +1,3 @@
<button class="cancel icon icon-cancel icon-12px"></button>
<h3>{{title}}</h3>
{{{text}}}
-
diff --git a/templates/articleList.html b/templates/articleList.hogan
similarity index 100%
rename from templates/articleList.html
rename to templates/articleList.hogan
diff --git a/templates/ctaDrawer.html b/templates/ctaDrawer.hogan
similarity index 100%
rename from templates/ctaDrawer.html
rename to templates/ctaDrawer.hogan
diff --git a/templates/modules/ImageOverlay.html
b/templates/modules/ImageOverlay.hogan
similarity index 100%
rename from templates/modules/ImageOverlay.html
rename to templates/modules/ImageOverlay.hogan
diff --git a/templates/modules/editor/AbuseFilterOverlay.html
b/templates/modules/editor/AbuseFilterOverlay.hogan
similarity index 100%
rename from templates/modules/editor/AbuseFilterOverlay.html
rename to templates/modules/editor/AbuseFilterOverlay.hogan
diff --git a/templates/modules/editor/AbuseFilterPanel.html
b/templates/modules/editor/AbuseFilterPanel.hogan
similarity index 100%
rename from templates/modules/editor/AbuseFilterPanel.html
rename to templates/modules/editor/AbuseFilterPanel.hogan
diff --git a/templates/modules/editor/EditorOverlay.html
b/templates/modules/editor/EditorOverlay.hogan
similarity index 100%
rename from templates/modules/editor/EditorOverlay.html
rename to templates/modules/editor/EditorOverlay.hogan
diff --git a/templates/modules/editor/EditorOverlayBase.html
b/templates/modules/editor/EditorOverlayBase.hogan
similarity index 100%
rename from templates/modules/editor/EditorOverlayBase.html
rename to templates/modules/editor/EditorOverlayBase.hogan
diff --git a/templates/modules/editor/EditorOverlayHeader.html
b/templates/modules/editor/EditorOverlayHeader.hogan
similarity index 100%
rename from templates/modules/editor/EditorOverlayHeader.html
rename to templates/modules/editor/EditorOverlayHeader.hogan
diff --git a/templates/modules/editor/VisualEditorOverlay.html
b/templates/modules/editor/VisualEditorOverlay.hogan
similarity index 100%
rename from templates/modules/editor/VisualEditorOverlay.html
rename to templates/modules/editor/VisualEditorOverlay.hogan
diff --git a/templates/modules/editor/VisualEditorOverlayHeader.html
b/templates/modules/editor/VisualEditorOverlayHeader.hogan
similarity index 100%
rename from templates/modules/editor/VisualEditorOverlayHeader.html
rename to templates/modules/editor/VisualEditorOverlayHeader.hogan
diff --git a/templates/modules/languages/LanguageOverlay.html
b/templates/modules/languages/LanguageOverlay.hogan
similarity index 100%
rename from templates/modules/languages/LanguageOverlay.html
rename to templates/modules/languages/LanguageOverlay.hogan
diff --git a/templates/modules/notifications/NotificationsOverlayContent.html
b/templates/modules/notifications/NotificationsOverlayContent.hogan
similarity index 100%
rename from templates/modules/notifications/NotificationsOverlayContent.html
rename to templates/modules/notifications/NotificationsOverlayContent.hogan
diff --git a/templates/modules/notifications/NotificationsOverlayFooter.html
b/templates/modules/notifications/NotificationsOverlayFooter.hogan
similarity index 100%
rename from templates/modules/notifications/NotificationsOverlayFooter.html
rename to templates/modules/notifications/NotificationsOverlayFooter.hogan
diff --git a/templates/modules/search/SearchOverlay.html
b/templates/modules/search/SearchOverlay.hogan
similarity index 100%
rename from templates/modules/search/SearchOverlay.html
rename to templates/modules/search/SearchOverlay.hogan
diff --git a/templates/modules/toc/toc.html b/templates/modules/toc/toc.hogan
similarity index 100%
rename from templates/modules/toc/toc.html
rename to templates/modules/toc/toc.hogan
diff --git a/templates/modules/toc/tocHeading.html
b/templates/modules/toc/tocHeading.hogan
similarity index 100%
rename from templates/modules/toc/tocHeading.html
rename to templates/modules/toc/tocHeading.hogan
diff --git a/templates/modules/tutorials/PageActionOverlay.html
b/templates/modules/tutorials/PageActionOverlay.hogan
similarity index 100%
rename from templates/modules/tutorials/PageActionOverlay.html
rename to templates/modules/tutorials/PageActionOverlay.hogan
diff --git a/templates/overlays/cleanup.html b/templates/overlays/cleanup.hogan
similarity index 100%
rename from templates/overlays/cleanup.html
rename to templates/overlays/cleanup.hogan
diff --git a/templates/overlays/nearby.html b/templates/overlays/nearby.hogan
similarity index 100%
rename from templates/overlays/nearby.html
rename to templates/overlays/nearby.hogan
diff --git a/templates/overlays/pagePreview.html
b/templates/overlays/pagePreview.hogan
similarity index 100%
rename from templates/overlays/pagePreview.html
rename to templates/overlays/pagePreview.hogan
diff --git a/templates/overlays/talk.html b/templates/overlays/talk.hogan
similarity index 100%
rename from templates/overlays/talk.html
rename to templates/overlays/talk.hogan
diff --git a/templates/overlays/talkSectionAdd.html
b/templates/overlays/talkSectionAdd.hogan
similarity index 100%
rename from templates/overlays/talkSectionAdd.html
rename to templates/overlays/talkSectionAdd.hogan
diff --git a/templates/page.html b/templates/page.hogan
similarity index 100%
rename from templates/page.html
rename to templates/page.hogan
diff --git a/templates/section.html b/templates/section.hogan
similarity index 100%
rename from templates/section.html
rename to templates/section.hogan
diff --git a/templates/specials/mobileoptions/checkbox.html
b/templates/specials/mobileoptions/checkbox.hogan
similarity index 100%
rename from templates/specials/mobileoptions/checkbox.html
rename to templates/specials/mobileoptions/checkbox.hogan
diff --git a/templates/specials/uploads/photo.html
b/templates/specials/uploads/photo.hogan
similarity index 100%
rename from templates/specials/uploads/photo.html
rename to templates/specials/uploads/photo.hogan
diff --git a/templates/specials/uploads/userGallery.html
b/templates/specials/uploads/userGallery.hogan
similarity index 100%
rename from templates/specials/uploads/userGallery.html
rename to templates/specials/uploads/userGallery.hogan
diff --git a/templates/talkSection.html b/templates/talkSection.hogan
similarity index 100%
rename from templates/talkSection.html
rename to templates/talkSection.hogan
diff --git a/templates/uploads/LeadPhoto.html
b/templates/uploads/LeadPhoto.hogan
similarity index 100%
rename from templates/uploads/LeadPhoto.html
rename to templates/uploads/LeadPhoto.hogan
diff --git a/templates/uploads/LeadPhotoUploaderButton.html
b/templates/uploads/LeadPhotoUploaderButton.hogan
similarity index 100%
rename from templates/uploads/LeadPhotoUploaderButton.html
rename to templates/uploads/LeadPhotoUploaderButton.hogan
diff --git a/templates/uploads/PhotoUploadOverlay.html
b/templates/uploads/PhotoUploadOverlay.hogan
similarity index 100%
rename from templates/uploads/PhotoUploadOverlay.html
rename to templates/uploads/PhotoUploadOverlay.hogan
diff --git a/templates/uploads/PhotoUploadProgress.html
b/templates/uploads/PhotoUploadProgress.hogan
similarity index 100%
rename from templates/uploads/PhotoUploadProgress.html
rename to templates/uploads/PhotoUploadProgress.hogan
diff --git a/templates/uploads/PhotoUploaderButton.html
b/templates/uploads/PhotoUploaderButton.hogan
similarity index 100%
rename from templates/uploads/PhotoUploaderButton.html
rename to templates/uploads/PhotoUploaderButton.hogan
diff --git a/templates/uploads/UploadTutorial.html
b/templates/uploads/UploadTutorial.hogan
similarity index 100%
rename from templates/uploads/UploadTutorial.html
rename to templates/uploads/UploadTutorial.hogan
diff --git a/templates/wikitext/commons-upload.html
b/templates/wikitext/commons-upload.hogan
similarity index 100%
rename from templates/wikitext/commons-upload.html
rename to templates/wikitext/commons-upload.hogan
diff --git a/tests/qunit/common/test_Overlay.js
b/tests/qunit/common/test_Overlay.js
index 1d52954..f89b5a6 100644
--- a/tests/qunit/common/test_Overlay.js
+++ b/tests/qunit/common/test_Overlay.js
@@ -19,7 +19,7 @@
TestOverlay = Overlay.extend( {
templatePartials: {
- content: M.template.compile( '<div
class="content">YO</div>' )
+ content: M.template.compile( '<div
class="content">YO</div>', 'hogan' )
}
} );
overlay = new TestOverlay( { heading: 'Awesome' } );
diff --git a/tests/qunit/common/test_View.js b/tests/qunit/common/test_View.js
index dcde1f7..b39934b 100644
--- a/tests/qunit/common/test_View.js
+++ b/tests/qunit/common/test_View.js
@@ -49,7 +49,7 @@
var ChildView, view;
ChildView = View.extend( {
className: 'my-class',
- template: M.template.compile(
'<h1>{{title}}</h1><p>{{content}}</p>' ),
+ template: M.template.compile(
'<h1>{{title}}</h1><p>{{content}}</p>', 'hogan' ),
title: function() {
return this.$( 'h1' ).text();
},
@@ -69,12 +69,12 @@
var ParentView, ChildView, view;
ParentView = View.extend( {
- template: M.template.compile( '<h1>{{title}}</h1>{{>content}}' )
+ template: M.template.compile( '<h1>{{title}}</h1>{{>content}}',
'hogan' )
} );
ChildView = ParentView.extend( {
templatePartials: {
- content: M.template.compile( '<p>{{text}}</p>' )
+ content: M.template.compile( '<p>{{text}}</p>', 'hogan'
)
}
} );
@@ -128,7 +128,7 @@
QUnit.test( 'View#preRender', 1, function() {
var ChildView, view;
ChildView = View.extend( {
- template: M.template.compile( '<p>{{something}}</p>' ),
+ template: M.template.compile( '<p>{{something}}</p>', 'hogan' ),
preRender: function( options ) {
options.something = 'hello';
}
--
To view, visit https://gerrit.wikimedia.org/r/149361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb9352e422dc105ac769bbe0db7e5525895204c7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
