Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89221
Change subject: Remove most of injected global variables
......................................................................
Remove most of injected global variables
Change-Id: Iff41883c4a5a1259fb9ccbfb1e1b670441933c66
---
M ProofreadPage.body.php
M includes/page/ProofreadPageContent.php
2 files changed, 17 insertions(+), 115 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/21/89221/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 061b655..e06af5c 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -198,125 +198,20 @@
$out->proofreadPageDone = true;
$title = $out->getTitle();
- if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
- list( $page_namespace, $index_namespace ) =
self::getPageAndIndexNamespace();
- if ( preg_match( "/^$page_namespace:(.*?)(\/(.*?)|)$/",
$out->getTitle()->getPrefixedText(), $m ) ) {
- ProofreadPage::preparePage( $out, $m, $isEdit );
- }
+ if ( $title->inNamespace( self::getIndexNamespaceId() ) ) {
+ //TODO move it somewhere better
+ $page = ProofreadPagePage::newFromTitle( $title );
+ $content = $page->getContent();
+ $out->addJsConfigVars( array(
+ 'prpPageQuality' =>
$content->getLevel()->getLevel()
+ ) );
} elseif ( $title->inNamespace( self::getIndexNamespaceId() ) )
{
if( !$isEdit ) {
- $out->addModules( 'ext.proofreadpage.base' );
+ $out->addModuleStyles( 'ext.proofreadpage.base'
);
}
} elseif ( $title->inNamespace( NS_MAIN ) ) {
self::prepareArticle( $out );
}
-
- return true;
- }
-
- /**
- * @param $out OutputPage
- * @param $m
- * @param $isEdit
- * @return bool
- */
- private static function preparePage( $out, $m, $isEdit ) {
- global $wgUser, $wgExtensionAssetsPath, $wgContLang;
-
- $pageTitle = $out->getTitle();
-
- if ( !isset( $pageTitle->prpIndexPage ) ) {
- self::loadIndex( $pageTitle );
- }
-
- $imageTitle = Title::makeTitleSafe( NS_IMAGE, $m[1] );
- if ( !$imageTitle ) {
- return true;
- }
-
- $fileName = null;
- $filePage = null;
-
- $image = wfFindFile( $imageTitle );
- if ( $image && $image->exists() ) {
- $fileName = $imageTitle->getPrefixedText();
-
- $width = $image->getWidth();
- $height = $image->getHeight();
- if ( $m[2] ) {
- $filePage = $wgContLang->parseFormattedNumber(
$m[3] );
-
- $params = array( 'width' => $width, 'page' =>
$filePage );
- $image->getHandler()->normaliseParams( $image,
$params );
- $thumbName = $image->thumbName( $params );
- $fullURL = $image->getThumbUrl( $thumbName );
- } else {
- $fullURL = $image->getViewURL();
- }
- $scanLink = Html::element( 'a',
- array(
- 'href' => $fullURL,
- 'title' => $out->msg(
'proofreadpage_image' )->text()
- ),
- $out->msg( 'proofreadpage_image' )->text()
- );
- } else {
- $width = 0;
- $height = 0;
- $fullURL = '';
- $scanLink = '';
- }
-
- $path = $wgExtensionAssetsPath . '/ProofreadPage';
- $jsVars = array(
- 'proofreadPageWidth' => intval( $width ),
- 'proofreadPageHeight' => intval( $height ),
- 'proofreadPageURL' => $fullURL,
- 'proofreadPageFileName' => $fileName,
- 'proofreadPageFilePage' => $filePage,
- 'proofreadPageIsEdit' => intval( $isEdit ),
- 'proofreadPageScanLink' => $scanLink,
- 'proofreadPageAddButtons' => $wgUser->isAllowed(
'pagequality' ),
- 'proofreadPageUserName' => $wgUser->getName(),
- 'proofreadPageIndexLink' => '',
- 'proofreadPageNextLink' => '',
- 'proofreadPagePrevLink' => '',
- 'proofreadPageEditWidth' => '',
- 'proofreadPageHeader' => '',
- 'proofreadPageFooter' => '',
- 'proofreadPageCss' => ''
- );
-
- $indexPage = $out->getTitle()->prpIndexPage;
- if ( $indexPage !== null ) {
- list( $prevTitle, $nextTitle ) =
$indexPage->getPreviousAndNextPages( $out->getTitle() );
- if ( $prevTitle !== null ) {
- $jsVars['proofreadPagePrevLink'] =
Linker::link( $prevTitle,
- Html::element( 'img', array( 'src' =>
$path . '/leftarrow.png',
- 'alt' => $out->msg(
'proofreadpage_nextpage' )->text(), 'width' => 15, 'height' => 15 ) ),
- array( 'title' => $out->msg(
'proofreadpage_prevpage' )->text() ) );
- }
- if ( $nextTitle !== null ) {
- $jsVars['proofreadPageNextLink'] =
Linker::link( $nextTitle,
- Html::element( 'img', array( 'src' =>
$path . '/rightarrow.png',
- 'alt' => $out->msg(
'proofreadpage_nextpage' )->text(), 'width' => 15, 'height' => 15 ) ),
- array( 'title' => $out->msg(
'proofreadpage_nextpage' )->text() ) );
- }
- $jsVars['proofreadPageIndexLink'] = Linker::link(
$indexPage->getTitle(),
- Html::element( 'img', array( 'src' => $path
. '/uparrow.png',
- 'alt' => $out->msg(
'proofreadpage_index' )->text(), 'width' => 15, 'height' => 15 ) ),
- array( 'title' => $out->msg(
'proofreadpage_index' )->text() ) );
-
- list( $header, $footer, $css, $editWidth ) =
$indexPage->getIndexDataForPage( $pageTitle );
- $jsVars['editWidth'] = $editWidth;
- $jsVars['proofreadPageHeader'] = $header;
- $jsVars['proofreadPageFooter'] = $footer;
- $jsVars['proofreadPageCss'] = $css;
- }
-
- $out->addJsConfigVars( $jsVars );
-
- $out->addModules( 'ext.proofreadpage.page' );
return true;
}
diff --git a/includes/page/ProofreadPageContent.php
b/includes/page/ProofreadPageContent.php
index 28c790c..11fb4d3 100644
--- a/includes/page/ProofreadPageContent.php
+++ b/includes/page/ProofreadPageContent.php
@@ -232,12 +232,12 @@
if( $this->isRedirect() ) {
return $this->body->getParserOutput( $title, $revId,
$options, $generateHtml );
}
-
if ( $options === null ) {
$options =
$this->getContentHandler()->makeParserOptions( 'canonical' );
}
$page = new ProofreadPagePage( $title, $this );
+ //create content
$wikitextContent = new WikitextContent(
$this->header->getNativeData() . "\n\n\n" .
$this->body->getNativeData() . $this->footer->getNativeData()
);
@@ -257,8 +257,8 @@
if ( $image ) {
$parserOutput->addImage(
$image->getTitle()->getDBkey(), $image->getTimestamp(), $image->getSha1() );
}
+
//page html
- //TODO FIXME: display whether page has been proofread by the
user or by someone else
$html = Html::openElement( 'div', array( 'class' =>
'prp-page-qualityheader quality' . $this->level->getLevel() ) ) .
wfMessage( 'proofreadpage_quality' .
$this->level->getLevel() . '_message' )->inContentLanguage()->parse() .
Html::closeElement( 'div' ) .
@@ -267,6 +267,13 @@
Html::closeElement( 'div' );
$parserOutput->setText( $page->createPageContainer( $html ) );
+ //add modules
+ $parserOutput->addModules( 'ext.proofreadpage.page' );
+ $parserOutput->addModuleStyles( array(
+ 'ext.proofreadpage.base',
+ 'ext.proofreadpage.page'
+ ) );
+
return $parserOutput;
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/89221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff41883c4a5a1259fb9ccbfb1e1b670441933c66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: pagePagesRefactoring
Gerrit-Owner: Tpt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
