jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358158 )
Change subject: Restricts modules loaded by addModuleStyles() to styles only
......................................................................
Restricts modules loaded by addModuleStyles() to styles only
Bug: T167353
Bug: T92459
Change-Id: I3618015426edeb4e1378fa72bee4b4d4da53756a
---
M extension.json
M includes/page/EditPagePage.php
M includes/page/PageViewAction.php
M modules/page/ext.proofreadpage.page.css
M modules/page/ext.proofreadpage.page.edit.css
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
6 files changed, 22 insertions(+), 28 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 47afd82..02b72ae 100644
--- a/extension.json
+++ b/extension.json
@@ -115,21 +115,19 @@
},
"ext.proofreadpage.page": {
"position": "top",
- "styles": "page/ext.proofreadpage.page.css",
- "dependencies": [
- "ext.proofreadpage.base",
- "ext.proofreadpage.ve.pageTarget.init"
- ]
+ "styles": "page/ext.proofreadpage.page.css"
},
"ext.proofreadpage.page.edit": {
"styles": "page/ext.proofreadpage.page.edit.css",
"scripts": "page/ext.proofreadpage.page.edit.js",
"dependencies": [
+ "ext.proofreadpage.base",
"ext.proofreadpage.page",
"jquery.prpZoom",
"mediawiki.user",
"user.options",
- "jquery.textSelection"
+ "jquery.textSelection",
+ "ext.proofreadpage.ve.pageTarget.init"
],
"messages": [
"proofreadpage_quality0_category",
diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index 66e6ec8..1baa64c 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -116,9 +116,7 @@
$out->addHTML( $this->pagePage->getPageContainerEnd() );
$out->addModules( 'ext.proofreadpage.page.edit' );
- $out->addModuleStyles( [
- 'ext.proofreadpage.page.edit',
'ext.proofreadpage.page', 'ext.proofreadpage.base'
- ] );
+ $out->addModuleStyles( [ 'ext.proofreadpage.base',
'ext.proofreadpage.page' ] );
}
/**
diff --git a/includes/page/PageViewAction.php b/includes/page/PageViewAction.php
index 80a0f0c..4e577e2 100644
--- a/includes/page/PageViewAction.php
+++ b/includes/page/PageViewAction.php
@@ -43,10 +43,8 @@
$out->addHTML( $page->getPageContainerEnd() );
// add modules
- $out->addModules( 'ext.proofreadpage.page' );
- $out->addModuleStyles( [
- 'ext.proofreadpage.base', 'ext.proofreadpage.page'
- ] );
+ $out->addModules( 'ext.proofreadpage.ve.pageTarget.init' );
+ $out->addModuleStyles( [ 'ext.proofreadpage.base',
'ext.proofreadpage.page' ] );
$out->addJsConfigVars( [
'prpPageQuality' => $content->getLevel()->getLevel()
] );
diff --git a/modules/page/ext.proofreadpage.page.css
b/modules/page/ext.proofreadpage.page.css
index e5feae2..09bf526 100644
--- a/modules/page/ext.proofreadpage.page.css
+++ b/modules/page/ext.proofreadpage.page.css
@@ -25,3 +25,17 @@
#prp-page-qualityheader { /* stylelint-disable-line selector-no-id */
width: 100%;
}
+
+/* CSS only editing interface */
+#editform .prp-page-content { /* stylelint-disable-line selector-no-id */
+ line-height: 1.5em;
+}
+
+#editform .prp-page-content label { /* stylelint-disable-line selector-no-id */
+ color: #808080;
+ font-size: 80%;
+}
+
+.editOptions {
+ clear: both;
+}
diff --git a/modules/page/ext.proofreadpage.page.edit.css
b/modules/page/ext.proofreadpage.page.edit.css
index 55d891e..5e8e1a0 100644
--- a/modules/page/ext.proofreadpage.page.edit.css
+++ b/modules/page/ext.proofreadpage.page.edit.css
@@ -1,16 +1,3 @@
-/* TODO: Don't use IDs */
-#editform .prp-page-content { /* stylelint-disable-line selector-no-id */
- line-height: 1.5em;
-}
-#editform .prp-page-content label { /* stylelint-disable-line selector-no-id */
- color: #808080;
- font-size: 80%;
-}
-
-.editOptions {
- clear: both;
-}
-
/* Adjustments for WikiEditor extension */
.wikiEditor-ui-text textarea {
border: 0;
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
index c28d735..556a56e 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
@@ -8,8 +8,7 @@
( function () {
mw.loader.using( 'ext.visualEditor.desktopArticleTarget.init', function
() {
// Adding this module to VisualEditorPluginModules would cause
it to load on
- // all VE-loading pages (even non PRP namespaces). Instead add
it to the plugin
- // list here, only on pages that have loaded
'ext.proofreadpage.page' first.
+ // all VE-loading pages (even non PRP namespaces).
mw.libs.ve.addPlugin( 'ext.proofreadpage.ve.pageTarget' );
} );
}() );
--
To view, visit https://gerrit.wikimedia.org/r/358158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3618015426edeb4e1378fa72bee4b4d4da53756a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Tpt <thoma...@hotmail.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
