Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/170779
Change subject: Hygiene: AbuseFilter overlay and panel should use core templates
......................................................................
Hygiene: AbuseFilter overlay and panel should use core templates
Also separate into a more meaningful module name.
Change-Id: I043f90b8a701fa8cc9fb8cbdbf6115777de7a44e
---
M includes/Resources.php
M javascripts/modules/editor/AbuseFilterOverlay.js
M javascripts/modules/editor/AbuseFilterPanel.js
3 files changed, 22 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/79/170779/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 1509cf4..77d717e 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -233,18 +233,19 @@
),
),
- 'mobile.editor.api' => $wgMFMobileResourceBoilerplate + array(
+ 'mobile.abusefilter' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
- 'mobile.stable',
- ),
- 'scripts' => array(
- 'javascripts/modules/editor/EditorApi.js',
- 'javascripts/modules/editor/AbuseFilterOverlay.js',
- 'javascripts/modules/editor/AbuseFilterPanel.js',
+ 'mobile.overlays',
+ 'mobile.startup',
+ 'mobile.templates',
),
'templates' => array(
- 'modules/editor/AbuseFilterOverlay.hogan',
- 'modules/editor/AbuseFilterPanel.hogan',
+ 'Overlay.hogan' =>
'templates/modules/editor/AbuseFilterOverlay.hogan',
+ 'Panel.hogan' =>
'templates/modules/editor/AbuseFilterPanel.hogan',
+ ),
+ 'scripts' => array(
+ 'javascripts/modules/editor/AbuseFilterOverlay.js',
+ 'javascripts/modules/editor/AbuseFilterPanel.js',
),
'messages' => array(
// AbuseFilterOverlay
@@ -256,6 +257,16 @@
),
),
+ 'mobile.editor.api' => $wgMFMobileResourceBoilerplate + array(
+ 'dependencies' => array(
+ 'mobile.stable',
+ 'mobile.abusefilter',
+ ),
+ 'scripts' => array(
+ 'javascripts/modules/editor/EditorApi.js',
+ ),
+ ),
+
'mobile.editor.common' => $wgMFResourceFileModuleBoilerplate + array(
'class' => 'ResourceLoaderParsedMessageModule',
'dependencies' => array(
diff --git a/javascripts/modules/editor/AbuseFilterOverlay.js
b/javascripts/modules/editor/AbuseFilterOverlay.js
index 942448d..d3237ac 100644
--- a/javascripts/modules/editor/AbuseFilterOverlay.js
+++ b/javascripts/modules/editor/AbuseFilterOverlay.js
@@ -11,7 +11,7 @@
confirmMessage: mw.msg(
'mobile-frontend-photo-ownership-confirm' )
},
templatePartials: {
- content: M.template.get(
'modules/editor/AbuseFilterOverlay.hogan' )
+ content: mw.template.get( 'mobile.abusefilter',
'Overlay.hogan' )
},
className: 'overlay abusefilter-overlay',
diff --git a/javascripts/modules/editor/AbuseFilterPanel.js
b/javascripts/modules/editor/AbuseFilterPanel.js
index bcf7126..a00860b 100644
--- a/javascripts/modules/editor/AbuseFilterPanel.js
+++ b/javascripts/modules/editor/AbuseFilterPanel.js
@@ -13,7 +13,7 @@
defaults: {
readMoreMsg: mw.msg(
'mobile-frontend-editor-abusefilter-read-more')
},
- template: M.template.get(
'modules/editor/AbuseFilterPanel.hogan' ),
+ template: mw.template.get( 'mobile.abusefilter', 'Panel.hogan'
),
className: 'panel hidden',
initialize: function () {
--
To view, visit https://gerrit.wikimedia.org/r/170779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I043f90b8a701fa8cc9fb8cbdbf6115777de7a44e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
