jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Use core template method in mobile.startup
......................................................................
Hygiene: Use core template method in mobile.startup
Change-Id: Id51dd83f1ef4fbd467878e36fea6846635619935
---
M includes/Resources.php
M javascripts/Icon.js
M javascripts/PageApi.js
M javascripts/Section.js
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 4e986c4..1509cf4 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -168,7 +168,7 @@
),
),
- 'mobile.startup' => $wgMFMobileResourceBoilerplate + array(
+ 'mobile.startup' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
'mobile.head',
'mobile.templates',
@@ -182,8 +182,8 @@
'mobile-frontend-language-article-heading',
),
'templates' => array(
- 'icon.hogan',
- 'Section.hogan',
+ 'icon.hogan' => 'templates/icon.hogan',
+ 'Section.hogan' => 'templates/Section.hogan',
),
'scripts' => array(
'javascripts/Router.js',
diff --git a/javascripts/Icon.js b/javascripts/Icon.js
index 0c052f5..e239526 100644
--- a/javascripts/Icon.js
+++ b/javascripts/Icon.js
@@ -43,7 +43,7 @@
toHtmlString: function () {
return this.$el.html();
},
- template: M.template.get( 'icon.hogan' )
+ template: mw.template.get( 'mobile.startup', 'icon.hogan' )
} );
M.define( 'Icon', Icon );
diff --git a/javascripts/PageApi.js b/javascripts/PageApi.js
index 07cc038..5576a35 100644
--- a/javascripts/PageApi.js
+++ b/javascripts/PageApi.js
@@ -1,6 +1,6 @@
( function ( M, $ ) {
var Api = M.require( 'api' ).Api, PageApi,
- sectionTemplate = M.template.get( 'Section.hogan' );
+ sectionTemplate = mw.template.get( 'mobile.startup',
'Section.hogan' );
/*
* Add child to listOfSections if the level of child is the same as the
last
diff --git a/javascripts/Section.js b/javascripts/Section.js
index 912105f..3427d5d 100644
--- a/javascripts/Section.js
+++ b/javascripts/Section.js
@@ -10,7 +10,7 @@
* @extends View
*/
Section = View.extend( {
- template: M.template.get( 'Section.hogan' ),
+ template: mw.template.get( 'mobile.startup', 'Section.hogan' ),
defaults: {
line: undefined,
text: '',
--
To view, visit https://gerrit.wikimedia.org/r/170777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id51dd83f1ef4fbd467878e36fea6846635619935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
