Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386918 )
Change subject: Hygiene: Merge mobile.abusefilter modules into
mobile.editor.common
......................................................................
Hygiene: Merge mobile.abusefilter modules into mobile.editor.common
There is no reason for this to be a separate module.
Change-Id: I7c84c281fc75140832bb6d5bb06f3e00a648099b
---
M extension.json
R resources/mobile.editor.common/AbuseFilterOverlay.hogan
R resources/mobile.editor.common/AbuseFilterOverlay.js
R resources/mobile.editor.common/AbuseFilterPanel.hogan
R resources/mobile.editor.common/AbuseFilterPanel.js
M resources/mobile.editor.overlay/EditorOverlay.js
6 files changed, 16 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/18/386918/1
diff --git a/extension.json b/extension.json
index 91ac639..60c0cbc 100644
--- a/extension.json
+++ b/extension.json
@@ -386,28 +386,6 @@
"resources/mobile.foreignApi/JSONPForeignApi.js"
]
},
- "mobile.abusefilter": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "dependencies": [
- "mobile.startup"
- ],
- "templates": {
- "Overlay.hogan":
"resources/mobile.abusefilter/AbuseFilterOverlay.hogan",
- "Panel.hogan":
"resources/mobile.abusefilter/AbuseFilterPanel.hogan"
- },
- "scripts": [
-
"resources/mobile.abusefilter/AbuseFilterOverlay.js",
-
"resources/mobile.abusefilter/AbuseFilterPanel.js"
- ],
- "messages": [
- "mobile-frontend-editor-abusefilter-warning",
- "mobile-frontend-editor-abusefilter-disallow",
- "mobile-frontend-editor-abusefilter-read-more"
- ]
- },
"mobile.editor.api": {
"targets": [
"mobile",
@@ -432,12 +410,16 @@
"mobile.loggingSchemas.edit"
],
"scripts": [
+
"resources/mobile.editor.common/AbuseFilterOverlay.js",
+
"resources/mobile.editor.common/AbuseFilterPanel.js",
"resources/mobile.editor.common/EditorOverlayBase.js"
],
"styles": [
"resources/mobile.editor.common/editor.less"
],
"templates": {
+ "AbuseFilterOverlay.hogan":
"resources/mobile.editor.common/AbuseFilterOverlay.hogan",
+ "AbuseFilterPanel.hogan":
"resources/mobile.editor.common/AbuseFilterPanel.hogan",
"editHeader.hogan":
"resources/mobile.editor.common/editHeader.hogan",
"previewHeader.hogan":
"resources/mobile.editor.common/previewHeader.hogan",
"saveHeader.hogan":
"resources/mobile.editor.common/saveHeader.hogan",
@@ -473,7 +455,10 @@
"23": "mobile-frontend-editor-switch-editor",
"24":
"mobile-frontend-editor-switch-visual-editor",
"25": "mobile-frontend-editor-anonwarning",
- "26": "mobile-frontend-editor-anon-cta-message"
+ "26": "mobile-frontend-editor-anon-cta-message",
+ "27":
"mobile-frontend-editor-abusefilter-warning",
+ "28":
"mobile-frontend-editor-abusefilter-disallow",
+ "29":
"mobile-frontend-editor-abusefilter-read-more"
}
},
"mobile.editor.overlay": {
@@ -482,7 +467,6 @@
"desktop"
],
"dependencies": [
- "mobile.abusefilter",
"mobile.editor.common",
"oojs-ui.styles.icons-editing-core",
"mediawiki.util",
diff --git a/resources/mobile.abusefilter/AbuseFilterOverlay.hogan
b/resources/mobile.editor.common/AbuseFilterOverlay.hogan
similarity index 100%
rename from resources/mobile.abusefilter/AbuseFilterOverlay.hogan
rename to resources/mobile.editor.common/AbuseFilterOverlay.hogan
diff --git a/resources/mobile.abusefilter/AbuseFilterOverlay.js
b/resources/mobile.editor.common/AbuseFilterOverlay.js
similarity index 84%
rename from resources/mobile.abusefilter/AbuseFilterOverlay.js
rename to resources/mobile.editor.common/AbuseFilterOverlay.js
index 5a97e88..6f9a3cf 100644
--- a/resources/mobile.abusefilter/AbuseFilterOverlay.js
+++ b/resources/mobile.editor.common/AbuseFilterOverlay.js
@@ -26,7 +26,7 @@
} ),
templatePartials: $.extend( {},
Overlay.prototype.templatePartials, {
button: Button.prototype.template,
- content: mw.template.get( 'mobile.abusefilter',
'Overlay.hogan' )
+ content: mw.template.get( 'mobile.editor.common',
'AbuseFilterOverlay.hogan' )
} ),
className: 'overlay abusefilter-overlay',
@@ -38,5 +38,6 @@
}
} );
- M.define( 'mobile.abusefilter/AbuseFilterOverlay', AbuseFilterOverlay );
+ M.define( 'mobile.editor.common/AbuseFilterOverlay', AbuseFilterOverlay
)
+ .deprecate( 'mobile.abusefilter/AbuseFilterOverlay' );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.abusefilter/AbuseFilterPanel.hogan
b/resources/mobile.editor.common/AbuseFilterPanel.hogan
similarity index 100%
rename from resources/mobile.abusefilter/AbuseFilterPanel.hogan
rename to resources/mobile.editor.common/AbuseFilterPanel.hogan
diff --git a/resources/mobile.abusefilter/AbuseFilterPanel.js
b/resources/mobile.editor.common/AbuseFilterPanel.js
similarity index 86%
rename from resources/mobile.abusefilter/AbuseFilterPanel.js
rename to resources/mobile.editor.common/AbuseFilterPanel.js
index 8db918d..1017d7a 100644
--- a/resources/mobile.abusefilter/AbuseFilterPanel.js
+++ b/resources/mobile.editor.common/AbuseFilterPanel.js
@@ -1,7 +1,7 @@
( function ( M ) {
var
View = M.require( 'mobile.startup/View' ),
- AbuseFilterOverlay = M.require(
'mobile.abusefilter/AbuseFilterOverlay' );
+ AbuseFilterOverlay = M.require(
'mobile.editor.common/AbuseFilterOverlay' );
/**
* Panel that shows an error message related to the abusefilter
extension.
@@ -29,7 +29,7 @@
defaults: {
readMoreMsg: mw.msg(
'mobile-frontend-editor-abusefilter-read-more' )
},
- template: mw.template.get( 'mobile.abusefilter', 'Panel.hogan'
),
+ template: mw.template.get( 'mobile.editor.common',
'AbuseFilterPanel.hogan' ),
className: 'panel hidden',
/**
@@ -68,6 +68,7 @@
}
} );
- M.define( 'mobile.abusefilter/AbuseFilterPanel', AbuseFilterPanel );
+ M.define( 'mobile.editor.common/AbuseFilterPanel', AbuseFilterPanel )
+ .deprecate( 'mobile.abusefilter/AbuseFilterPanel' );
}( mw.mobileFrontend ) );
diff --git a/resources/mobile.editor.overlay/EditorOverlay.js
b/resources/mobile.editor.overlay/EditorOverlay.js
index 473204e..6e3954a 100644
--- a/resources/mobile.editor.overlay/EditorOverlay.js
+++ b/resources/mobile.editor.overlay/EditorOverlay.js
@@ -3,7 +3,7 @@
var EditorOverlayBase = M.require(
'mobile.editor.common/EditorOverlayBase' ),
Section = M.require( 'mobile.startup/Section' ),
EditorGateway = M.require( 'mobile.editor.api/EditorGateway' ),
- AbuseFilterPanel = M.require(
'mobile.abusefilter/AbuseFilterPanel' ),
+ AbuseFilterPanel = M.require(
'mobile.editor.common/AbuseFilterPanel' ),
Button = M.require( 'mobile.startup/Button' ),
toast = M.require( 'mobile.startup/toast' ),
MessageBox = M.require( 'mobile.messageBox/MessageBox' );
--
To view, visit https://gerrit.wikimedia.org/r/386918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c84c281fc75140832bb6d5bb06f3e00a648099b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
