Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97924
Change subject: Load page module when the navigation is displayed
......................................................................
Load page module when the navigation is displayed
Change-Id: I53a7f19e1d74f74f097c358a7038ad863f97b278
---
M ProofreadPage.body.php
M ProofreadPage.php
R modules/page/ext.proofreadpage.page.navigation.js
R modules/page/ext.proofreadpage.page.navigation.vector.css
4 files changed, 17 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/24/97924/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 9089369..206eebe 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -184,21 +184,21 @@
* @param $out OutputPage
* @return bool
*/
- public static function onBeforePageDisplay( $out ) {
+ public static function onBeforePageDisplay( OutputPage $out ) {
$action = $out->getRequest()->getVal( 'action' );
- $isEdit = ( $action == 'submit' || $action == 'edit' );
-
- if ( ( !$out->isArticle() && !$isEdit ) || isset(
$out->proofreadPageDone ) ) {
- return true;
- }
- $out->proofreadPageDone = true;
+ $isEdit = ( $action === 'submit' || $action === 'edit' );
$title = $out->getTitle();
if ( $title->inNamespace( self::getIndexNamespaceId() ) ) {
- if( !$isEdit ) {
- $out->addModuleStyles( 'ext.proofreadpage.base'
);
- }
- } elseif ( $title->inNamespace( NS_MAIN ) ) {
+ $out->addModuleStyles( 'ext.proofreadpage.base' );
+ } elseif ( $title->inNamespace( self::getPageNamespaceId() ) ) {
+ $out->addModules( 'ext.proofreadpage.page.navigation' );
+ } elseif (
+ $title->inNamespace( NS_MAIN ) &&
+ ( $out->isArticle() || $isEdit ) &&
+ !isset( $out->proofreadPageDone )
+ ) {
+ $out->proofreadPageDone = true;
self::prepareArticle( $out );
}
diff --git a/ProofreadPage.php b/ProofreadPage.php
index f32e9a1..a4fb194 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -118,10 +118,6 @@
),
'ext.proofreadpage.page' => $prpResourceTemplate + array(
'styles' => 'page/ext.proofreadpage.page.css',
- 'scripts' => 'page/ext.proofreadpage.page.js',
- 'skinStyles' => array(
- 'vector' => 'page/ext.proofreadpage.page.vector.css',
- ),
'dependencies' => array( 'ext.proofreadpage.base' )
),
'ext.proofreadpage.page.edit' => $prpResourceTemplate + array(
@@ -145,6 +141,12 @@
'proofreadpage-preferences-showheaders-label',
)
),
+ 'ext.proofreadpage.page.navigation' => $prpResourceTemplate + array(
+ 'scripts' => 'page/ext.proofreadpage.page.navigation.js',
+ 'skinStyles' => array(
+ 'vector' =>
'page/ext.proofreadpage.page.navigation.vector.css',
+ )
+ ),
'ext.proofreadpage.article' => $prpResourceTemplate + array(
'scripts' => 'article/ext.proofreadpage.article.js',
'dependencies' => array( 'ext.proofreadpage.base' )
diff --git a/modules/page/ext.proofreadpage.page.js
b/modules/page/ext.proofreadpage.page.navigation.js
similarity index 100%
rename from modules/page/ext.proofreadpage.page.js
rename to modules/page/ext.proofreadpage.page.navigation.js
diff --git a/modules/page/ext.proofreadpage.page.vector.css
b/modules/page/ext.proofreadpage.page.navigation.vector.css
similarity index 100%
rename from modules/page/ext.proofreadpage.page.vector.css
rename to modules/page/ext.proofreadpage.page.navigation.vector.css
--
To view, visit https://gerrit.wikimedia.org/r/97924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53a7f19e1d74f74f097c358a7038ad863f97b278
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
