jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: mobile.ajax should use core template mechanism
......................................................................
Hygiene: mobile.ajax should use core template mechanism
Change-Id: I0fcb28af4952653647f9ce8e8952644734d21da3
---
M includes/Resources.php
M javascripts/Overlay.js
M javascripts/modules/nearby/Nearby.js
M javascripts/specials/uploads.js
4 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 04cefc8..7a6993f 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -162,9 +162,9 @@
'position' => 'top',
),
- 'mobile.ajax' => $wgMFMobileResourceBoilerplate + array(
+ 'mobile.ajax' => $wgMFResourceFileModuleBoilerplate + array(
'templates' => array(
- 'spinner.hogan',
+ 'spinner.hogan' => 'templates/spinner.hogan',
),
),
diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js
index 1d0b31c..7af2751 100644
--- a/javascripts/Overlay.js
+++ b/javascripts/Overlay.js
@@ -42,7 +42,7 @@
*/
className: 'overlay',
templatePartials: {
- spinner: M.template.get( 'spinner.hogan' )
+ spinner: mw.template.get( 'mobile.ajax',
'spinner.hogan' )
},
template: M.template.get( 'Overlay.hogan' ),
defaults: {
diff --git a/javascripts/modules/nearby/Nearby.js
b/javascripts/modules/nearby/Nearby.js
index c4724dd..8cded34 100644
--- a/javascripts/modules/nearby/Nearby.js
+++ b/javascripts/modules/nearby/Nearby.js
@@ -34,7 +34,7 @@
}
},
templatePartials: {
- spinner: M.template.get( 'spinner.hogan' ),
+ spinner: mw.template.get( 'mobile.ajax',
'spinner.hogan' ),
pageList: PageList.prototype.template
},
template: mw.template.get( 'mobile.nearby', 'Nearby.hogan' ),
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
index 1e1cd82..7a3c860 100644
--- a/javascripts/specials/uploads.js
+++ b/javascripts/specials/uploads.js
@@ -86,7 +86,7 @@
PhotoList = View.extend( {
template: M.template.get( 'specials/userGallery.hogan' ),
templatePartials: {
- spinner: M.template.get( 'spinner.hogan' )
+ spinner: mw.template.get( 'mobile.ajax',
'spinner.hogan' )
},
initialize: function () {
// how close a spinner needs to be to the viewport to
trigger loading (px)
--
To view, visit https://gerrit.wikimedia.org/r/170798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fcb28af4952653647f9ce8e8952644734d21da3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org>
Gerrit-Reviewer: Phuedx <g...@samsmith.io>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
