[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Adds PageQualityLevelLookup

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/406009 )

Change subject: Adds PageQualityLevelLookup
..

Adds PageQualityLevelLookup

Change-Id: Ief0459292f90b742337f68d622e638a40c41bf38
---
M ProofreadPage.body.php
M extension.json
M includes/Context.php
M includes/Page/ProofreadPageDbConnector.php
M includes/Parser/PagesTagParser.php
A includes/page/DatabasePageQualityLevelLookup.php
A includes/page/PageQualityLevelLookup.php
M tests/phpunit/ContextTest.php
A tests/phpunit/Page/DatabasePageQualityLevelLookupTest.php
A tests/phpunit/Page/PageQualityLevelLookupMock.php
M tests/phpunit/ProofreadPageTestCase.php
11 files changed, 267 insertions(+), 149 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/09/406009/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index b50dea5..8f00ac4 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -146,72 +146,39 @@
 
/**
 * Hook function
-* @param array $page_ids Prefixed DB keys of the pages linked to, 
indexed by page_id
+* @param array $pageIds Prefixed DB keys of the pages linked to, 
indexed by page_id
 * @param array &$colours CSS classes, indexed by prefixed DB keys
 * @return bool
 */
-   public static function onGetLinkColours( $page_ids, &$colours ) {
+   public static function onGetLinkColours( $pageIds, &$colours ) {
global $wgTitle;
if ( !isset( $wgTitle ) ) {
return true;
}
-   self::getLinkColours( $page_ids, $colours );
+
+   $inIndexNamespace = $wgTitle->inNamespace( 
self::getIndexNamespaceId() );
+   $pageQualityLevelLookup = 
Context::getDefaultContext()->getPageQualityLevelLookup();
+
+   $pageTitles = array_map( function ( $prefixedDbKey ) {
+   return Title::newFromText( $prefixedDbKey );
+   }, $pageIds );
+   $pageQualityLevelLookup->prefetchQualityLevelForTitles( 
$pageTitles );
+
+   /** @var Title|null $pageTitle */
+   foreach ( $pageTitles as $pageTitle ) {
+   if ( $pageTitle !== null && $pageTitle->inNamespace( 
self::getPageNamespaceId() ) ) {
+   $pageLevel = 
$pageQualityLevelLookup->getQualityLevelForPageTitle( $pageTitle );
+   if ( $pageLevel !== null ) {
+   $classes = 
"prp-pagequality-{$pageLevel}";
+   if ( $inIndexNamespace ) {
+   $classes .= " 
quality{$pageLevel}";
+   }
+   
$colours[$pageTitle->getPrefixedDBkey()] = $classes;
+   }
+   }
+   }
+
return true;
-   }
-
-   /**
-* Return the quality colour codes to pages linked from an index page
-* @param array $page_ids Prefixed DB keys of the pages linked to, 
indexed by page_id
-* @param array $colours CSS classes, indexed by prefixed DB keys
-*/
-   private static function getLinkColours( $page_ids, &$colours ) {
-   global $wgTitle;
-
-   $page_namespace_id = self::getPageNamespaceId();
-   $in_index_namespace = $wgTitle->inNamespace( 
self::getIndexNamespaceId() );
-
-   $values = [];
-   foreach ( $page_ids as $id => $pdbk ) {
-   $title = Title::newFromText( $pdbk );
-   // consider only link in page namespace
-   if ( $title->inNamespace( $page_namespace_id ) ) {
-   if ( $in_index_namespace ) {
-   $colours[$pdbk] = 'quality1 
prp-pagequality-1';
-   } else {
-   $colours[$pdbk] = 'prp-pagequality-1';
-   }
-   $values[] = intval( $id );
-   }
-   }
-
-   // Get the names of the quality categories.  Replaces earlier 
code which
-   // called wfMessage()->inContentLanguagE() 5 times for each 
page.
-   // ISSUE: Should the number of quality levels be adjustable?
-   // ISSUE 2: Should this array be saved as a member variable?
-   // How often is this code called anyway?
-   $qualityCategories = [];
-   for ( $i = 0; $i < 5; $i++ ) {
-   $cat = Title::makeTitleSafe( NS_CATEGORY,
-   wfMessage( "proofreadpage_quality{$i}_category" 
)->inContentLanguage()->text() );
-   if ( $cat ) {
-  

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses PSR-4 autoloader

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401082 )

Change subject: Uses PSR-4 autoloader
..

Uses PSR-4 autoloader

Change-Id: I9758d20d0ef9df40c188574004d5df45968c2417
---
M extension.json
R includes/Index/CustomIndexField.php
R includes/Index/CustomIndexFieldsParser.php
R includes/Index/DatabaseIndexContentLookup.php
R includes/Index/EditIndexPage.php
R includes/Index/IndexContent.php
R includes/Index/IndexContentHandler.php
R includes/Index/IndexContentLookup.php
R includes/Index/IndexDifferenceEngine.php
R includes/Index/IndexEditAction.php
R includes/Index/IndexRedirectContent.php
R includes/Index/IndexSubmitAction.php
R includes/Index/ParserHelper.php
R includes/Index/ProofreadIndexDbConnector.php
R includes/Page/DatabaseIndexForPageLookup.php
R includes/Page/EditPagePage.php
R includes/Page/IndexForPageLookup.php
R includes/Page/PageContent.php
R includes/Page/PageContentBuilder.php
R includes/Page/PageContentHandler.php
R includes/Page/PageDifferenceEngine.php
R includes/Page/PageDisplayHandler.php
R includes/Page/PageEditAction.php
R includes/Page/PageLevel.php
R includes/Page/PageSubmitAction.php
R includes/Page/PageViewAction.php
R includes/Page/ProofreadPageDbConnector.php
R tests/phpunit/Index/CustomIndexFieldsParserTest.php
R tests/phpunit/Index/IndexContentHandlerTest.php
R tests/phpunit/Index/IndexContentLookupMock.php
R tests/phpunit/Index/IndexContentTest.php
R tests/phpunit/Index/IndexRedirectContentTest.php
R tests/phpunit/Index/ParserHelperTest.php
R tests/phpunit/Page/DatabaseIndexForPageLookupTest.php
R tests/phpunit/Page/IndexForPageLookupMock.php
R tests/phpunit/Page/PageContentBuilderTest.php
R tests/phpunit/Page/PageContentHandlerTest.php
R tests/phpunit/Page/PageContentTest.php
R tests/phpunit/Page/PageDisplayHandlerTest.php
R tests/phpunit/Page/PageLevelTest.php
40 files changed, 7 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/82/401082/1

diff --git a/extension.json b/extension.json
index 2de9048..0e1f5a5 100644
--- a/extension.json
+++ b/extension.json
@@ -43,60 +43,20 @@
"ExtensionMessagesFiles": {
"ProofreadPageAlias": "ProofreadPage.alias.php"
},
+   "AutoloadNamespaces": {
+   "ProofreadPage\\": "includes/"
+   },
"AutoloadClasses": {
"ProofreadPage": "ProofreadPage.body.php",
-   "ProofreadPage\\Context": "includes/Context.php",
-   "ProofreadPage\\ProofreadPageInit": 
"includes/ProofreadPageInit.php",
-   "ProofreadPage\\DiffFormatterUtils": 
"includes/DiffFormatterUtils.php",
-   "ProofreadPage\\FileNotFoundException": 
"includes/FileNotFoundException.php",
-   "ProofreadPage\\PageNumberNotFoundException": 
"includes/PageNumberNotFoundException.php",
-   "ProofreadPage\\FileProvider": "includes/FileProvider.php",
-   "ProofreadPage\\Link": "includes/Link.php",
-   "ProofreadPage\\Index\\CustomIndexField": 
"includes/index/CustomIndexField.php",
-   "ProofreadPage\\Index\\CustomIndexFieldsParser": 
"includes/index/CustomIndexFieldsParser.php",
-   "ProofreadPage\\Index\\IndexContentLookup": 
"includes/index/IndexContentLookup.php",
-   "ProofreadPage\\Index\\DatabaseIndexContentLookup": 
"includes/index/DatabaseIndexContentLookup.php",
-   "ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
-   "ProofreadPage\\Index\\IndexRedirectContent": 
"includes/index/IndexRedirectContent.php",
-   "ProofreadPage\\Index\\IndexContentHandler": 
"includes/index/IndexContentHandler.php",
-   "ProofreadPage\\Index\\IndexDifferenceEngine": 
"includes/index/IndexDifferenceEngine.php",
-   "ProofreadPage\\Index\\IndexEditAction": 
"includes/index/IndexEditAction.php",
-   "ProofreadPage\\Index\\IndexSubmitAction": 
"includes/index/IndexSubmitAction.php",
-   "ProofreadPage\\Index\\ParserHelper": 
"includes/index/ParserHelper.php",
-   "ProofreadPage\\Index\\EditIndexPage": 
"includes/index/EditIndexPage.php",
-   "ProofreadIndexDbConnector": 
"includes/index/ProofreadIndexDbConnector.php",
-   "ProofreadPage\\Pagination\\PaginationFactory": 
"includes/Pagination/PaginationFactory.php",
-   "ProofreadPage\\Pagination\\PageNumber": 
"includes/Pagination/PageNumber.php",
-   "ProofreadPage\\Pagination\\PageList": 
"includes/Pagination/PageList.php",
-   "ProofreadPage\\Pagination\\Pagination": 
"includes/Pagination/Pagination.php",
-   "ProofreadPage\\Pagination\\FilePagination": 
"includes/Pagination/FilePagination.php",
-   "ProofreadPage\\Pagination\\PagePagination": 

[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: Applies some coding standards

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401053 )

Change subject: Applies some coding standards
..

Applies some coding standards

* adds visibility to static function
* rename methods to be camlCased
* drops an unused static variable
* Replaces some "==" with "===" when it does not change semantics
* is_null -> "=== null"

Change-Id: I4dbf4deac88ae393cb9eac3161a7026fa299b807
---
M .phpcs.xml
M LabeledSectionTransclusion.class.php
2 files changed, 28 insertions(+), 80 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LabeledSectionTransclusion
 refs/changes/53/401053/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 9b3fa34..53b90b0 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,9 +3,7 @@



-   

-   

.

diff --git a/LabeledSectionTransclusion.class.php 
b/LabeledSectionTransclusion.class.php
index 8a5eaeb..a119bb9 100644
--- a/LabeledSectionTransclusion.class.php
+++ b/LabeledSectionTransclusion.class.php
@@ -2,13 +2,11 @@
 
 class LabeledSectionTransclusion {
 
-   private static $loopCheck = [];
-
/**
 * @param Parser $parser
 * @return bool
 */
-   static function setup( $parser ) {
+   public static function setup( $parser ) {
$parser->setHook( 'section', [ __CLASS__, 'noop' ] );
$parser->setFunctionHook( 'lst', [ __CLASS__, 'pfuncIncludeObj' 
], Parser::SFH_OBJECT_ARGS );
$parser->setFunctionHook( 'lstx', [ __CLASS__, 
'pfuncExcludeObj' ], Parser::SFH_OBJECT_ARGS );
@@ -24,7 +22,7 @@
 * @param string $langCode
 * @return bool
 */
-   static function setupMagic( &$magicWords, $langCode ) {
+   public static function setupMagic( &$magicWords, $langCode ) {
global $wgParser, $wgLstLocal;
 
switch ( $langCode ) {
@@ -70,7 +68,7 @@
 * @param string $part1
 * @return bool
 */
-   static function open_( $parser, $part1 ) {
+   private static function open( $parser, $part1 ) {
// Infinite loop test
if ( isset( $parser->mTemplatePath[$part1] ) ) {
wfDebug( __METHOD__ . ": template loop broken at 
'$part1'\n" );
@@ -78,21 +76,6 @@
} else {
$parser->mTemplatePath[$part1] = 1;
return true;
-   }
-   }
-
-   /**
-* Finish processing the function.
-* @param Parser $parser
-* @param string $part1
-* @return bool
-*/
-   static function close_( $parser, $part1 ) {
-   // Infinite loop test
-   if ( isset( $parser->mTemplatePath[$part1] ) ) {
-   unset( $parser->mTemplatePath[$part1] );
-   } else {
-   wfDebug( __METHOD__ . ": close unopened template loop 
at '$part1'\n" );
}
}
 
@@ -106,14 +89,13 @@
 * @param int $skiphead Number of source string headers to skip for 
numbering
 * @return mixed string or magic array of bits
 * @todo handle mixed-case 
-* @private
 */
-   static function parse_( $parser, $title, $text, $part1, $skiphead = 0 ) 
{
+   private static function parse( $parser, $title, $text, $part1, 
$skiphead = 0 ) {
// if someone tries something likelst 
only
// text, may as well do the right thing.
$text = str_replace( '', '', $text );
 
-   if ( self::open_( $parser, $part1 ) ) {
+   if ( self::open( $parser, $part1 ) ) {
// Try to get edit sections correct by munging around 
the parser's guts.
return [ $text, 'title' => $title, 'replaceHeadings' => 
true,
'headingOffset' => $skiphead, 'noparse' => 
false, 'noargs' => false ];
@@ -136,36 +118,8 @@
 * @param Parser $parser
 * @return string HTML output
 */
-   static function noop( $in, $assocArgs = [], $parser = null ) {
+   public static function noop( $in, $assocArgs = [], $parser = null ) {
return '';
-   }
-
-   /**
-* Generate a regex to match the section(s) we're interested in.
-* @param string $sec Name of target section
-* @param string $to Optional name of section to end with, if 
transcluding
-*   multiple sections in sequence. If blank, will 
assume
-*   same section name as started with.
-* @return string regex
-* @private
-*/
-   static function getPattern_( $sec, $to ) {
-   global $wgLstLocal;
-
-   $beginAttr = self::getAttrPattern_( $sec, 'begin' );
-   

[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: Makes parser tests pass

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401050 )

Change subject: Makes parser tests pass
..

Makes parser tests pass

Proper edit sections with #lsth seems broken since a long time (see task 
T160240)

Bug: T160240
Change-Id: I809e1dbb0f9d3dfd5f7a2e3fdeb950b92cbfbafa
---
M lsthParserTests.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LabeledSectionTransclusion
 refs/changes/50/401050/1

diff --git a/lsthParserTests.txt b/lsthParserTests.txt
index 3ec9d60..b6dcf63 100644
--- a/lsthParserTests.txt
+++ b/lsthParserTests.txt
@@ -80,7 +80,7 @@
 !!result
 sec 2
 
-3[edit]
+3[edit]
 sec 3
 
 !!end

-- 
To view, visit https://gerrit.wikimedia.org/r/401050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I809e1dbb0f9d3dfd5f7a2e3fdeb950b92cbfbafa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LabeledSectionTransclusion
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Tpt (Code Review)]

Tpt has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400841 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Squiz.Scope.MethodScope.Missing

Change-Id: Ib60b5fa536a24412604c0d38738394a1c8bbef30
---
M .phpcs.xml
M composer.json
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Libraryupgrader: Looks good to me, approved
  Tpt: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index d531208..9b3fa34 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -5,6 +5,7 @@



+   

.

diff --git a/composer.json b/composer.json
index 6c45e79..f3cbcc4 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {

-- 
To view, visit https://gerrit.wikimedia.org/r/400841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib60b5fa536a24412604c0d38738394a1c8bbef30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LabeledSectionTransclusion
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Libraryupgrader 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Tpt (Code Review)]

Tpt has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400899 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Ie6396bc76e39579fc17e85c5fd4be03cba339384
---
M composer.json
M includes/Pagination/PageList.php
M includes/page/PageContent.php
M includes/page/PageDisplayHandler.php
4 files changed, 5 insertions(+), 9 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  Tpt: Verified



diff --git a/composer.json b/composer.json
index 9e62dfa..bc02705 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.2.1"
},
diff --git a/includes/Pagination/PageList.php b/includes/Pagination/PageList.php
index 0991b00..dcc7167 100644
--- a/includes/Pagination/PageList.php
+++ b/includes/Pagination/PageList.php
@@ -92,8 +92,7 @@
 * @return bool
 */
protected function numberInRange( $range, $number ) {
-   return
-   is_numeric( $range ) && $range == $number ||
+   return is_numeric( $range ) && $range == $number ||
preg_match( '/^([0-9]*)to([0-9]*)$/', $range, $m ) &&
$m[1] <= $number && $number <= $m[2];
}
diff --git a/includes/page/PageContent.php b/includes/page/PageContent.php
index 8e2caab..01a85c0 100644
--- a/includes/page/PageContent.php
+++ b/includes/page/PageContent.php
@@ -117,8 +117,7 @@
return false;
}
 
-   return
-   $this->header->equals( $that->getHeader() ) &&
+   return $this->header->equals( $that->getHeader() ) &&
$this->body->equals( $that->getBody() ) &&
$this->footer->equals( $that->getFooter() ) &&
$this->level->equals( $that->getLevel() );
diff --git a/includes/page/PageDisplayHandler.php 
b/includes/page/PageDisplayHandler.php
index cc70981..85ea436 100644
--- a/includes/page/PageDisplayHandler.php
+++ b/includes/page/PageDisplayHandler.php
@@ -86,8 +86,7 @@
 * @return string
 */
public function buildPageContainerBegin() {
-   return
-   Html::openElement( 'div', [ 'class' => 
'prp-page-container' ] ) .
+   return Html::openElement( 'div', [ 'class' => 
'prp-page-container' ] ) .
Html::openElement( 'div', [ 'class' => 
'prp-page-content' ] );
}
 
@@ -96,8 +95,7 @@
 * @return string
 */
public function buildPageContainerEnd( Title $pageTitle ) {
-   return
-   Html::closeElement( 'div' ) .
+   return Html::closeElement( 'div' ) .
Html::openElement( 'div', [ 'class' => 'prp-page-image' 
] ) .
$this->buildImageHtml( $pageTitle, [ 'max-width' => 
$this->getImageWidth( $pageTitle ) ] ) .
Html::closeElement( 'div' ) .

-- 
To view, visit https://gerrit.wikimedia.org/r/400899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6396bc76e39579fc17e85c5fd4be03cba339384
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Fixes CI failure

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398226 )

Change subject: Fixes CI failure
..

Fixes CI failure

Bug: T182553
Change-Id: I9b047dfdf24ebbeea0899433227cb2d0fca12a43
---
M tests/phpunit/Pagination/FilePaginationTest.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/26/398226/1

diff --git a/tests/phpunit/Pagination/FilePaginationTest.php 
b/tests/phpunit/Pagination/FilePaginationTest.php
index f5ce725..382162a 100644
--- a/tests/phpunit/Pagination/FilePaginationTest.php
+++ b/tests/phpunit/Pagination/FilePaginationTest.php
@@ -134,8 +134,8 @@
$this->getContext()
);
$this->assertEquals(
-   Title::makeTitle( $this->getPageNamespaceId(), 
'LoremIpsum.djvu/2' ),
-   $pagination->getPageTitle( 2 )
+   'Page:LoremIpsum.djvu/2',
+   $pagination->getPageTitle( 2 )->getFullText()
);
}
 
@@ -175,14 +175,14 @@
$this->assertEquals( 2, $pagination->key() );
$this->assertTrue( $pagination->valid() );
$this->assertEquals(
-   Title::makeTitle( $this->getPageNamespaceId(), 
'LoremIpsum.djvu/2' ),
-   $pagination->current()
+   'Page:LoremIpsum.djvu/2',
+   $pagination->current()->getFullText()
);
$pagination->rewind();
$this->assertEquals( 1, $pagination->key() );
$this->assertEquals(
-   Title::makeTitle( $this->getPageNamespaceId(), 
'LoremIpsum.djvu/1' ),
-   $pagination->current()
+'Page:LoremIpsum.djvu/1',
+   $pagination->current()->getFullText()
);
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/398226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b047dfdf24ebbeea0899433227cb2d0fca12a43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikisource[master]: Better extension description

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/396575 )

Change subject: Better extension description
..

Better extension description

Change-Id: I9aeb9f2060e3e137052d4e32e2ce65be4d6d6d91
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikisource 
refs/changes/75/396575/1

diff --git a/i18n/en.json b/i18n/en.json
index 27d5b48..0c69ec1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,4 +1,4 @@
 {
"@metadata": {},
-   "wikisource-desc": "Wikisource-specific Lua and JavaScript modules"
+   "wikisource-desc": "Wikisource-specific MediaWiki customizations"
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/396575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aeb9f2060e3e137052d4e32e2ce65be4d6d6d91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikisource
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Do not fail if no image is built from the Page: page name

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394770 )

Change subject: Do not fail if no image is built from the Page: page name
..

Do not fail if no image is built from the Page: page name

Bug: T181868
Change-Id: Id59366c391ac8e573af667cd5acdee17c6d5c628
---
M includes/page/DatabaseIndexForPageLookup.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/70/394770/1

diff --git a/includes/page/DatabaseIndexForPageLookup.php 
b/includes/page/DatabaseIndexForPageLookup.php
index e71a3c2..7f2163e 100644
--- a/includes/page/DatabaseIndexForPageLookup.php
+++ b/includes/page/DatabaseIndexForPageLookup.php
@@ -75,7 +75,7 @@
if ( $imageTitle !== null ) {
$image = $this->repoGroup->findFile( 
$imageTitle );
// if it is multipage, we use the page order of 
the file
-   if ( $image->exists() && $image->isMultipage() 
) {
+   if ( $image !== false && $image->exists() && 
$image->isMultipage() ) {
return Title::makeTitle(
$this->indexNamespaceId, 
$image->getTitle()->getText()
);

-- 
To view, visit https://gerrit.wikimedia.org/r/394770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id59366c391ac8e573af667cd5acdee17c6d5c628
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Properly setup ProofreadPage namespaces for cywikisource

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394189 )

Change subject: Properly setup ProofreadPage namespaces for cywikisource
..

Properly setup ProofreadPage namespaces for cywikisource

Bug: T181406
Change-Id: I3ae3f2bbe6ae0abdb4ec3b2bccb8abe75a68f803
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/89/394189/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 895b29b..929bb50 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4773,6 +4773,10 @@
'page' => 102,
'index' => 104,
],
+   'cywikisource' => [
+   'page' => 104,
+   'index' => 106,
+   ],
'dawikisource' => [
'page' => 104,
'index' => 106,
@@ -6147,12 +6151,6 @@
'cswikisource' => [
100 => 'Autor',
101 => 'Diskuse_k_autorovi',
-   ],
-   'cywikisource' => [
-   104 => 'Tudalen',  // T41264 (Page)
-   105 => 'Sgwrs_Tudalen',// T41264
-   106 => 'Indecs',   // T41264 (Index)
-   107 => 'Sgwrs_Indecs', // T41264
],
'dawikisource' => [
102 => 'Forfatter', // T9796

-- 
To view, visit https://gerrit.wikimedia.org/r/394189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ae3f2bbe6ae0abdb4ec3b2bccb8abe75a68f803
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Removes usages of deprecated methods in EditIndexPage

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393181 )

Change subject: Removes usages of deprecated methods in EditIndexPage
..

Removes usages of deprecated methods in EditIndexPage

Change-Id: I94623cca2007c971748cf934c84aada2035ba584
---
M includes/index/EditIndexPage.php
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/81/393181/1

diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index 0dd7ad4..f1e0008 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -47,7 +47,7 @@
 * @see EditPage::showContentForm
 */
protected function showContentForm() {
-   $pageLang = $this->mTitle->getPageLanguage();
+   $pageLang = $this->getTitle()->getPageLanguage();
$out = $this->context->getOutput();
$out->enableOOUI();
$inputOptions = [ 'lang' => $pageLang->getCode(), 'dir' => 
$pageLang->getDir() ];
@@ -81,7 +81,7 @@
 
private function buildField( CustomIndexField $field, $inputOptions ) {
$key = $this->getFieldNameForEntry( $field->getKey() );
-   $val = $this->safeUnicodeOutput( $field->getStringValue() );
+   $val = $field->getStringValue();
 
$inputOptions['name'] = $key;
$inputOptions['value'] = $val;
@@ -149,7 +149,7 @@
$fields = [];
foreach ( $config as $key => $params ) {
$field = $this->getFieldNameForEntry( $key );
-   $value = $this->cleanInputtedContent( 
$this->safeUnicodeInput( $request, $field ) );
+   $value = $this->cleanInputtedContent( 
$request->getText( $field ) );
$entry = new CustomIndexField( $key, $value, $params );
if ( !$entry->isHidden() ) {
$fields[$entry->getKey()] = new 
WikitextContent( $entry->getStringValue() );
@@ -172,17 +172,16 @@
$value = preg_replace( '/\|/', '&!&', $value );
 
// ...except in links...
-   $prev = '';
do {
$prev = $value;
$value = preg_replace( '/\[\[(.*?)&!&(.*?)\]\]/', 
'[[$1|$2]]', $value );
-   } while ( $value != $prev );
+   } while ( $value !== $prev );
 
// ..and in templates
do {
$prev = $value;
$value = preg_replace( '/\{\{(.*?)&!&(.*?)\}\}/s', 
'{{$1|$2}}', $value );
-   } while ( $value != $prev );
+   } while ( $value !== $prev );
 
$value = preg_replace( '/&!&/', '{{!}}', $value );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/393181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94623cca2007c971748cf934c84aada2035ba584
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Avoids to call the deprecated EditPage::safeUnicodeInput fun...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393124 )

Change subject: Avoids to call the deprecated EditPage::safeUnicodeInput 
function
..

Avoids to call the deprecated EditPage::safeUnicodeInput function

Change-Id: Ie1b5479993020c33e83edea5c4e880d86842bb7b
---
M includes/page/EditPagePage.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/24/393124/1

diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index b196cea..c8e3802 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -199,9 +199,9 @@
$currentContent = $this->getCurrentContent();
 
return $this->pageContentBuilder->buildContentFromInput(
-   $this->safeUnicodeInput( $request, 'wpHeaderTextbox' ),
-   $this->safeUnicodeInput( $request, 'wpTextbox1' ),
-   $this->safeUnicodeInput( $request, 'wpFooterTextbox' ),
+   $request->getText( 'wpHeaderTextbox' ),
+   $request->getText( 'wpTextbox1' ),
+   $request->getText( 'wpFooterTextbox' ),
$request->getInt( 'wpQuality', 
$currentContent->getLevel()->getLevel() ),
$currentContent
)->serialize();

-- 
To view, visit https://gerrit.wikimedia.org/r/393124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1b5479993020c33e83edea5c4e880d86842bb7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Introduces constants for Page: pages quality levels

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392213 )

Change subject: Introduces constants for Page: pages quality levels
..

Introduces constants for Page: pages quality levels

Change-Id: I3a971f0b6ecf95485dbc98c1ece861c18e24a860
---
M includes/page/PageLevel.php
M tests/phpunit/page/PageContentTest.php
M tests/phpunit/page/PageLevelTest.php
3 files changed, 69 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/13/392213/1

diff --git a/includes/page/PageLevel.php b/includes/page/PageLevel.php
index 39951ea..da72342 100644
--- a/includes/page/PageLevel.php
+++ b/includes/page/PageLevel.php
@@ -12,10 +12,16 @@
  */
 class PageLevel {
 
+   const WITHOUT_TEXT = 0;
+   const NOT_PROOFREAD = 1;
+   const PROBLEMATIC = 2;
+   const PROOFREAD = 3;
+   const VALIDATED = 4;
+
/**
 * @var integer proofreading level of the page
 */
-   protected $level = 1;
+   protected $level = self::NOT_PROOFREAD;
 
/**
 * @var User|null last user of the page
@@ -27,7 +33,7 @@
 * @param int $level
 * @param User|null $user
 */
-   public function __construct( $level = 1, User $user = null ) {
+   public function __construct( $level = self::NOT_PROOFREAD, User $user = 
null ) {
$this->level = $level;
$this->user = $user;
}
@@ -54,7 +60,7 @@
 * @return bool
 */
public function isValid() {
-   return is_integer( $this->level ) && 0 <= $this->level && 
$this->level <= 4;
+   return is_int( $this->level ) && 0 <= $this->level && 
$this->level <= 4;
}
 
/**
@@ -68,11 +74,14 @@
return false;
}
 
-   return
-   $this->level === $that->getLevel() &&
-   ( $this->user === null && $that->getUser() === null ||
-   $this->user instanceof User && $that->getUser() 
instanceof User &&
-   $this->user->getName() === 
$that->getUser()->getName() );
+   return $this->level === $that->getLevel() &&
+   (
+   ( $this->user === null && $that->getUser() === 
null ) ||
+   (
+   ( $this->user instanceof User && 
$that->getUser() instanceof User ) &&
+   ( $this->user->getName() === 
$that->getUser()->getName() )
+   )
+   );
}
 
/**
@@ -89,14 +98,17 @@
}
 
$fromUser = ( $this->user instanceof User ) ? $this->user : 
$to->getUser();
-   if ( $to->getLevel() === 4 && ( $this->level < 3 || 
$this->level === 3 &&
-   $fromUser->getName() === $to->getUser()->getName() ) &&
+   return !(
+   $to->getLevel() === self::VALIDATED &&
+   (
+   $this->level < self::PROOFREAD ||
+   (
+   $this->level === self::PROOFREAD &&
+   $fromUser !== null && 
$fromUser->getName() === $to->getUser()->getName()
+   )
+   ) &&
!$to->getUser()->isAllowed( 'pagequality-admin' )
-   ) {
-   return false;
-   }
-
-   return true;
+   );
}
 
/**
diff --git a/tests/phpunit/page/PageContentTest.php 
b/tests/phpunit/page/PageContentTest.php
index 7f18235..67b0e9f 100644
--- a/tests/phpunit/page/PageContentTest.php
+++ b/tests/phpunit/page/PageContentTest.php
@@ -239,7 +239,7 @@
],
[
Status::newFatal( 
'proofreadpage_notallowedtext' ),
-   self::newContent( '', '', '', 4 )
+   self::newContent( '', '', '', 
PageLevel::VALIDATED )
]
];
}
diff --git a/tests/phpunit/page/PageLevelTest.php 
b/tests/phpunit/page/PageLevelTest.php
index 1105909..dc1e471 100644
--- a/tests/phpunit/page/PageLevelTest.php
+++ b/tests/phpunit/page/PageLevelTest.php
@@ -7,7 +7,7 @@
 
 /**
  * @group ProofreadPage
- * @covers ProofreadPageLevel
+ * @covers PageLevel
  */
 class PageLevelTest extends ProofreadPageTestCase {
 
@@ -78,53 +78,63 @@
 
return [
[
-   new PageLevel( 1, $testUser ),
-   new PageLevel( 2, $ipUser ),
+   new PageLevel( PageLevel::NOT_PROOFREAD, 
$testUser 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Cleans up DatabaseIndexForPageLookup

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392207 )

Change subject: Cleans up DatabaseIndexForPageLookup
..

Cleans up DatabaseIndexForPageLookup

Change-Id: Ie0f40d740d8e529a1d465e796cf43259949f9deb
---
M includes/index/ProofreadIndexDbConnector.php
M includes/page/DatabaseIndexForPageLookup.php
2 files changed, 26 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/07/392207/1

diff --git a/includes/index/ProofreadIndexDbConnector.php 
b/includes/index/ProofreadIndexDbConnector.php
index 6ff1bc7..ffd44a4 100644
--- a/includes/index/ProofreadIndexDbConnector.php
+++ b/includes/index/ProofreadIndexDbConnector.php
@@ -22,26 +22,6 @@
 class ProofreadIndexDbConnector {
 
/**
-* Query the database to find if the current page is referred in an 
Index page.
-* @param Title $title
-* @return ResultWrapper
-*/
-   public static function getRowsFromTitle( Title $title ) {
-   $dbr = wfGetDB( DB_REPLICA );
-   $result = $dbr->select(
-   [ 'page', 'pagelinks' ],
-   [ 'page_namespace', 'page_title' ],
-   [
-   'pl_namespace' => $title->getNamespace(),
-   'pl_title' => $title->getDBkey(),
-   'pl_from=page_id'
-   ],
-   __METHOD__
-   );
-   return $result;
-   }
-
-   /**
 * @param Object $x
 * @param int $indexId
 * @param WikiPage $article
diff --git a/includes/page/DatabaseIndexForPageLookup.php 
b/includes/page/DatabaseIndexForPageLookup.php
index 1c5a402..e71a3c2 100644
--- a/includes/page/DatabaseIndexForPageLookup.php
+++ b/includes/page/DatabaseIndexForPageLookup.php
@@ -2,7 +2,6 @@
 
 namespace ProofreadPage\Page;
 
-use ProofreadIndexDbConnector;
 use RepoGroup;
 use Title;
 
@@ -39,14 +38,8 @@
 */
public function getIndexForPageTitle( Title $pageTitle ) {
$cacheKey = $pageTitle->getDBkey();
-
if ( !array_key_exists( $cacheKey, $this->cache ) ) {
-   $indexTitle = $this->findIndexTitle( $pageTitle );
-   if ( $indexTitle === null ) {
-   $this->cache[$cacheKey] = null;
-   } else {
-   $this->cache[$cacheKey] = $indexTitle;
-   }
+   $this->cache[$cacheKey] = $this->findIndexTitle( 
$pageTitle );
}
return $this->cache[$cacheKey];
}
@@ -55,21 +48,13 @@
$possibleIndexTitle = $this->findPossibleIndexTitleBasedOnName( 
$pageTitle );
 
// Try to find links from Index: pages
-   $result = ProofreadIndexDbConnector::getRowsFromTitle( 
$pageTitle );
$indexesThatLinksHere = [];
-   foreach ( $result as $x ) {
-   $refTitle = Title::makeTitle( $x->page_namespace, 
$x->page_title );
-   if ( $refTitle !== null &&
-   $refTitle->inNamespace( $this->indexNamespaceId 
)
-   ) {
-   if ( $possibleIndexTitle !== null &&
-   // It is the same as the linked file, 
we know it's this Index:
-   $refTitle->equals( $possibleIndexTitle )
-   ) {
-   return $refTitle;
-   }
-   $indexesThatLinksHere[] = $refTitle;
+   foreach ( $this->findIndexesWhichLinkTo( $pageTitle ) as 
$indexTitle ) {
+   // It is the same as the linked file, we know it's this 
Index:
+   if ( $possibleIndexTitle !== null && 
$indexTitle->equals( $possibleIndexTitle ) ) {
+   return $indexTitle;
}
+   $indexesThatLinksHere[] = $indexTitle;
}
if ( !empty( $indexesThatLinksHere ) ) {
// TODO: what should we do if there are more than 1 
possible index?
@@ -99,4 +84,24 @@
}
return null;
}
+
+   private function findIndexesWhichLinkTo( Title $title ) {
+   $results = wfGetDB( DB_REPLICA )->select(
+   [ 'page', 'pagelinks' ],
+   [ 'page_namespace', 'page_title' ],
+   [
+   'pl_namespace' => $title->getNamespace(),
+   'pl_title' => $title->getDBkey(),
+   'pl_from=page_id',
+   

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses IndexForPageLookup in ProofreadPage.body.php

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392204 )

Change subject: Uses IndexForPageLookup in ProofreadPage.body.php
..

Uses IndexForPageLookup in ProofreadPage.body.php

Change-Id: I2f5c4de9d90243ddfd03e203a46e83e229621fce
---
M ProofreadPage.body.php
1 file changed, 15 insertions(+), 49 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/04/392204/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 8e7a3b6..e10c3f4 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -119,42 +119,6 @@
}
 
/**
-* Query the database to find if the current page is referred in an 
Index page.
-* @param Title $title
-*/
-   public static function loadIndex( $title ) {
-   $title->prpIndexTitle = null;
-   $result = ProofreadIndexDbConnector::getRowsFromTitle( $title );
-
-   foreach ( $result as $x ) {
-   $refTitle = Title::makeTitle( $x->page_namespace, 
$x->page_title );
-   if ( $refTitle !== null && $refTitle->inNamespace( 
self::getIndexNamespaceId() ) ) {
-   $title->prpIndexTitle = $refTitle;
-   return;
-   }
-   }
-
-   $m = explode( '/', $title->getText(), 2 );
-   if ( !isset( $m[1] ) ) {
-   return;
-   }
-   $imageTitle = Title::makeTitleSafe( NS_FILE, $m[0] );
-   if ( $imageTitle === null ) {
-   return;
-   }
-   $image = wfFindFile( $imageTitle );
-   // if it is multipage, we use the page order of the file
-   if ( $image && $image->exists() && $image->isMultipage() ) {
-   $indexTitle = Title::makeTitle(
-   self::getIndexNamespaceId(), 
$image->getTitle()->getText()
-   );
-   if ( $indexTitle !== null ) {
-   $title->prpIndexTitle = $indexTitle;
-   }
-   }
-   }
-
-   /**
 * Append javascript variables and code to the page.
 * @param OutputPage $out
 * @return bool
@@ -294,9 +258,9 @@
 * @param boolean $deleted indicates whether the page was deleted
 */
private static function updateIndexOfPage( Title $title, $deleted = 
false ) {
-   self::loadIndex( $title );
-   if ( $title->prpIndexTitle !== null ) {
-   $indexTitle = $title->prpIndexTitle;
+   $indexTitle = Context::getDefaultContext()
+   ->getIndexForPageLookup()->getIndexForPageTitle( $title 
);
+   if ( $indexTitle !== null ) {
$indexTitle->invalidateCache();
$index = WikiPage::factory( $indexTitle );
if ( $index ) {
@@ -325,22 +289,21 @@
}
 
/* check if there is an index */
-   if ( !isset( $title->prpIndexTitle ) ) {
-   self::loadIndex( $title );
-   }
-   if ( $title->prpIndexTitle === null ) {
+   $indexTitle = Context::getDefaultContext()
+   ->getIndexForPageLookup()->getIndexForPageTitle( $title 
);
+   if ( $indexTitle === null ) {
return true;
}
 
/**
 * invalidate the cache of the index page
 */
-   $title->prpIndexTitle->invalidateCache();
+   $indexTitle->invalidateCache();
 
/**
 * update pr_index iteratively
 */
-   $indexId = $title->prpIndexTitle->getArticleID();
+   $indexId = $indexTitle->getArticleID();
$indexData = 
ProofreadIndexDbConnector::getIndexDataFromIndexPageId( $indexId );
if ( $indexData ) {
ProofreadIndexDbConnector::replaceIndexById( 
$indexData, $indexId, $article );
@@ -420,10 +383,13 @@
}
 
if ( $nt->inNamespace( self::getPageNamespaceId() ) ) {
-   self::loadIndex( $nt );
-   if ( $nt->prpIndexTitle !== null
-   && ( !isset( $ot->prpIndexTitle ) ||
-   ( $nt->prpIndexTitle->equals( 
$ot->prpIndexTitle ) ) )
+   $oldIndexTitle = Context::getDefaultContext()
+   
->getIndexForPageLookup()->getIndexForPageTitle( $ot );
+   $newIndexTitle = Context::getDefaultContext()
+   
->getIndexForPageLookup()->getIndexForPageTitle( $nt );
+ 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Removes ProofreadPagePage and ProofreadIndexPage

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392194 )

Change subject: Removes ProofreadPagePage and ProofreadIndexPage
..

Removes ProofreadPagePage and ProofreadIndexPage

Change-Id: Ib77a4a0aae7c92fc38e4f97d9caa55d659768d2d
---
M ProofreadPage.body.php
M includes/FileProvider.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PagePagination.php
M includes/Pagination/Pagination.php
M includes/Pagination/PaginationFactory.php
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagesTagParser.php
M includes/index/DatabaseIndexContentLookup.php
M includes/index/IndexContentLookup.php
D includes/index/ProofreadIndexPage.php
M includes/page/DatabaseIndexForPageLookup.php
M includes/page/EditPagePage.php
M includes/page/IndexForPageLookup.php
M includes/page/PageContentBuilder.php
M includes/page/PageDisplayHandler.php
M includes/page/PageEditAction.php
M includes/page/PageSubmitAction.php
M includes/page/PageViewAction.php
D includes/page/ProofreadPagePage.php
M tests/phpunit/FileProviderTest.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PagePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
M tests/phpunit/ProofreadPageTestCase.php
M tests/phpunit/index/IndexContentLookupMock.php
D tests/phpunit/index/ProofreadIndexPageTest.php
M tests/phpunit/page/DatabaseIndexForPageLookupTest.php
M tests/phpunit/page/IndexForPageLookupMock.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageDisplayHandlerTest.php
D tests/phpunit/page/ProofreadPagePageTest.php
32 files changed, 322 insertions(+), 587 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/94/392194/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index c088bc1..8e7a3b6 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -123,13 +123,13 @@
 * @param Title $title
 */
public static function loadIndex( $title ) {
-   $title->prpIndexPage = null;
+   $title->prpIndexTitle = null;
$result = ProofreadIndexDbConnector::getRowsFromTitle( $title );
 
foreach ( $result as $x ) {
$refTitle = Title::makeTitle( $x->page_namespace, 
$x->page_title );
if ( $refTitle !== null && $refTitle->inNamespace( 
self::getIndexNamespaceId() ) ) {
-   $title->prpIndexPage = 
ProofreadIndexPage::newFromTitle( $refTitle );
+   $title->prpIndexTitle = $refTitle;
return;
}
}
@@ -149,7 +149,7 @@
self::getIndexNamespaceId(), 
$image->getTitle()->getText()
);
if ( $indexTitle !== null ) {
-   $title->prpIndexPage = 
ProofreadIndexPage::newFromTitle( $indexTitle );
+   $title->prpIndexTitle = $indexTitle;
}
}
}
@@ -295,8 +295,8 @@
 */
private static function updateIndexOfPage( Title $title, $deleted = 
false ) {
self::loadIndex( $title );
-   if ( $title->prpIndexPage !== null ) {
-   $indexTitle = $title->prpIndexPage->getTitle();
+   if ( $title->prpIndexTitle !== null ) {
+   $indexTitle = $title->prpIndexTitle;
$indexTitle->invalidateCache();
$index = WikiPage::factory( $indexTitle );
if ( $index ) {
@@ -325,22 +325,22 @@
}
 
/* check if there is an index */
-   if ( !isset( $title->prpIndexPage ) ) {
+   if ( !isset( $title->prpIndexTitle ) ) {
self::loadIndex( $title );
}
-   if ( $title->prpIndexPage === null ) {
+   if ( $title->prpIndexTitle === null ) {
return true;
}
 
/**
 * invalidate the cache of the index page
 */
-   $title->prpIndexPage->getTitle()->invalidateCache();
+   $title->prpIndexTitle->invalidateCache();
 
/**
 * update pr_index iteratively
 */
-   $indexId = $title->prpIndexPage->getTitle()->getArticleID();
+   $indexId = $title->prpIndexTitle->getArticleID();
$indexData = 
ProofreadIndexDbConnector::getIndexDataFromIndexPageId( $indexId );
if ( $indexData ) {
ProofreadIndexDbConnector::replaceIndexById( 
$indexData, $indexId, $article );
@@ -421,9 +421,9 @@
 
if ( $nt->inNamespace( self::getPageNamespaceId() ) ) {
 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Correctly expand optional parameters during Index: pages ren...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392190 )

Change subject: Correctly expand optional parameters during Index: pages 
rendering
..

Correctly expand optional parameters during Index: pages rendering

Bug: T180664
Change-Id: I9ab1fdf7711587bf88cb1f9d745b4b0275466d45
---
M includes/index/ParserHelper.php
M tests/phpunit/index/ParserHelperTest.php
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/90/392190/1

diff --git a/includes/index/ParserHelper.php b/includes/index/ParserHelper.php
index 80c3af8..bebe4a5 100644
--- a/includes/index/ParserHelper.php
+++ b/includes/index/ParserHelper.php
@@ -20,7 +20,7 @@
 
public function __construct( Title $title = null, ParserOptions 
$options ) {
$this->parser = new Parser();
-   $this->parser->startExternalParse( $title, $options, 
Parser::OT_PLAIN );
+   $this->parser->startExternalParse( $title, $options, 
Parser::OT_PREPROCESS );
}
 
/**
diff --git a/tests/phpunit/index/ParserHelperTest.php 
b/tests/phpunit/index/ParserHelperTest.php
index 2f8000f..081babe 100644
--- a/tests/phpunit/index/ParserHelperTest.php
+++ b/tests/phpunit/index/ParserHelperTest.php
@@ -23,7 +23,7 @@
[
'{{{foo|}}}',
[ 'bar' => 'baz' ],
-   '{{{foo|}}}'
+   ''
],
[
'{{{bar|}}}',
@@ -40,6 +40,16 @@
[ 'bar' => 'baz' ],
'baz'
],
+   [
+   'foo',
+   [ 'bar' => 'baz' ],
+   ''
+   ],
+   [
+   'foo',
+   [ 'bar' => 'baz' ],
+   'foo'
+   ],
];
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/392190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ab1fdf7711587bf88cb1f9d745b4b0275466d45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Correctly expand optional parameters during Index: pages ren...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392187 )

Change subject: Correctly expand optional parameters during Index: pages 
rendering
..

Correctly expand optional parameters during Index: pages rendering

Bug: T180664
Change-Id: I8bd3a2494ad78168d4ed569c766eb642794972cb
---
M includes/index/ParserHelper.php
M tests/phpunit/index/ParserHelperTest.php
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/87/392187/1

diff --git a/includes/index/ParserHelper.php b/includes/index/ParserHelper.php
index 80c3af8..bebe4a5 100644
--- a/includes/index/ParserHelper.php
+++ b/includes/index/ParserHelper.php
@@ -20,7 +20,7 @@
 
public function __construct( Title $title = null, ParserOptions 
$options ) {
$this->parser = new Parser();
-   $this->parser->startExternalParse( $title, $options, 
Parser::OT_PLAIN );
+   $this->parser->startExternalParse( $title, $options, 
Parser::OT_PREPROCESS );
}
 
/**
diff --git a/tests/phpunit/index/ParserHelperTest.php 
b/tests/phpunit/index/ParserHelperTest.php
index 2f8000f..081babe 100644
--- a/tests/phpunit/index/ParserHelperTest.php
+++ b/tests/phpunit/index/ParserHelperTest.php
@@ -23,7 +23,7 @@
[
'{{{foo|}}}',
[ 'bar' => 'baz' ],
-   '{{{foo|}}}'
+   ''
],
[
'{{{bar|}}}',
@@ -40,6 +40,16 @@
[ 'bar' => 'baz' ],
'baz'
],
+   [
+   'foo',
+   [ 'bar' => 'baz' ],
+   ''
+   ],
+   [
+   'foo',
+   [ 'bar' => 'baz' ],
+   'foo'
+   ],
];
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/392187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bd3a2494ad78168d4ed569c766eb642794972cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Introduces IndexForPageLookup

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390886 )

Change subject: Introduces IndexForPageLookup
..

Introduces IndexForPageLookup

Change-Id: I3cea1f364e36c1809a76579f64bbb83b900b0284
---
M ProofreadPage.body.php
M extension.json
M includes/Context.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PaginationFactory.php
A includes/page/DatabaseIndexForPageLookup.php
A includes/page/IndexForPageLookup.php
M includes/page/PageContentBuilder.php
M includes/page/PageDisplayHandler.php
M includes/page/ProofreadPagePage.php
M tests/phpunit/ContextTest.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PagePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
M tests/phpunit/ProofreadPageTestCase.php
A tests/phpunit/page/DatabaseIndexForPageLookupTest.php
A tests/phpunit/page/IndexForPageLookupMock.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageDisplayHandlerTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
20 files changed, 346 insertions(+), 190 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/86/390886/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 2b78412..c771bed 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -741,8 +741,8 @@
}
 
// Prev, Next and Index links
-   $indexPage = $page->getIndex();
-   if ( $indexPage ) {
+   $indexPage = 
Context::getDefaultContext()->getIndexForPageLookup()->getIndexForPage( $page );
+   if ( $indexPage !== null ) {
$pagination = Context::getDefaultContext()

->getPaginationFactory()->getPaginationForIndexPage( $indexPage );
try {
diff --git a/extension.json b/extension.json
index 30fff6c..ae1ab61 100644
--- a/extension.json
+++ b/extension.json
@@ -82,6 +82,8 @@
"ProofreadPage\\Page\\PageViewAction": 
"includes/page/PageViewAction.php",
"ProofreadPage\\Page\\PageDifferenceEngine": 
"includes/page/PageDifferenceEngine.php",
"ProofreadPage\\Page\\PageDisplayHandler": 
"includes/page/PageDisplayHandler.php",
+   "ProofreadPage\\Page\\IndexForPageLookup": 
"includes/page/IndexForPageLookup.php",
+   "ProofreadPage\\Page\\DatabaseIndexForPageLookup": 
"includes/page/DatabaseIndexForPageLookup.php",
"ProofreadPage\\Parser\\ParserEntryPoint": 
"includes/Parser/ParserEntryPoint.php",
"ProofreadPage\\Parser\\TagParser": 
"includes/Parser/TagParser.php",
"ProofreadPage\\Parser\\PagelistTagParser": 
"includes/Parser/PagelistTagParser.php",
@@ -92,6 +94,7 @@
"ApiQueryProofread": "ApiQueryProofread.php",
"ApiQueryProofreadInfo": "ApiQueryProofreadInfo.php",
"ProofreadPage\\FileProviderMock": 
"tests/phpunit/FileProviderMock.php",
+   "ProofreadPage\\Page\\IndexForPageLookupMock": 
"tests/phpunit/page/IndexForPageLookupMock.php",
"ProofreadPageTestCase": 
"tests/phpunit/ProofreadPageTestCase.php",
"FixProofreadPagePagesContentModel": 
"maintenance/fixProofreadPagePagesContentModel.php",
"FixProofreadIndexPagesContentModel": 
"maintenance/fixProofreadIndexPagesContentModel.php"
diff --git a/includes/Context.php b/includes/Context.php
index 0bbd60d..4644bfb 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -3,6 +3,8 @@
 namespace ProofreadPage;
 
 use ProofreadPage\Index\CustomIndexFieldsParser;
+use ProofreadPage\Page\DatabaseIndexForPageLookup;
+use ProofreadPage\Page\IndexForPageLookup;
 use ProofreadPage\Pagination\PaginationFactory;
 use RepoGroup;
 
@@ -38,19 +40,26 @@
private $customIndexFieldsParser;
 
/**
+* @var IndexForPageLookup
+*/
+   private $indexForPageLookup;
+
+   /**
 * @param int $pageNamespaceId
 * @param int $indexNamespaceId
 * @param FileProvider $fileProvider
 * @param CustomIndexFieldsParser $customIndexFieldsParser
+* @param IndexForPageLookup $indexForPageLookup
 */
public function __construct(
$pageNamespaceId, $indexNamespaceId, FileProvider $fileProvider,
-   CustomIndexFieldsParser $customIndexFieldsParser
+   CustomIndexFieldsParser $customIndexFieldsParser, 
IndexForPageLookup $indexForPageLookup
) {
$this->pageNamespaceId = $pageNamespaceId;
$this->indexNamespaceId = $indexNamespaceId;
$this->fileProvider = $fileProvider;
$this->customIndexFieldsParser = $customIndexFieldsParser;
+   $this->indexForPageLookup = $indexForPageLookup;
}
 
 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disables TwoColConflict waiting for compatibility with Proof...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386582 )

Change subject: Disables TwoColConflict waiting for compatibility with 
ProofreadPage
..

Disables TwoColConflict waiting for compatibility with ProofreadPage

Bug: T179056
Change-Id: Ib176f8348796a54f72c51dcbe26b14b845774276
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/82/386582/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 45dd5a3..f9ec0e1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17759,6 +17759,7 @@
 
 'wmgUseTwoColConflict' => [
'default' => true,
+   'wikisource' => false // T179056
 ],
 
 'wmgUseUserMerge' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/386582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib176f8348796a54f72c51dcbe26b14b845774276
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Small code cleanup of the page quality edit widget

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376884 )

Change subject: Small code cleanup of the page quality edit widget
..

Small code cleanup of the page quality edit widget

Change-Id: I38147fea55b38180b18b625a43ae8a5bf05a766e
---
M includes/page/EditPagePage.php
1 file changed, 26 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/84/376884/1

diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index cb9eaeb..28f19cc 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -11,6 +11,7 @@
 use ProofreadPage\Context;
 use ProofreadPagePage;
 use Status;
+use User;
 
 /**
  * @licence GNU GPL v2+
@@ -149,17 +150,23 @@
 * @see EditPage::getCheckboxesWidget
 */
public function getCheckboxesWidget( &$tabindex, $checked ) {
-   $oldLevel = $this->getCurrentContent()->getLevel();
-
-   $content = $this->toEditContent( $this->textbox1 );
-   $currentLevel = $content->getLevel();
-
-   $qualityLevels = [ 0, 2, 1, 3, 4 ];
-   $html = '';
$checkboxes = parent::getCheckboxesWidget( $tabindex, $checked 
);
$user = $this->context->getUser();
 
-   foreach ( $qualityLevels as $level ) {
+   if ( $user->isAllowed( 'pagequality' ) ) {
+   $checkboxes['wpr-pageStatus'] = 
$this->buildQualityEditWidget( $user, $tabindex );
+   }
+
+   return $checkboxes;
+   }
+
+   private function buildQualityEditWidget( User $user, &$tabindex ) {
+   $oldLevel = $this->getCurrentContent()->getLevel();
+   $content = $this->toEditContent( $this->textbox1 );
+   $currentLevel = $content->getLevel();
+
+   $html = '';
+   for ( $level = 0; $level <= 4; $level++ ) {
$newLevel = new PageLevel( $level, $user );
if ( !$oldLevel->isChangeAllowed( $newLevel ) ) {
continue;
@@ -181,22 +188,17 @@
Html::closeElement( 'span' );
}
 
-   $checkboxes['wpr-pageStatus'] = new OOUI\Widget( [ 'content' => 
new OOUI\HtmlSnippet( '' ) ] );
-   if ( $user->isAllowed( 'pagequality' ) ) {
-   $content =
-   Html::openElement( 'span', [ 'id' => 
'wpQuality-container' ] ) .
-   $html .
-   Html::closeElement( 'span' ) .
-   Html::OpenElement( 'label', [ 'for' => 
'wpQuality-container' ] ) .
-   $this->context->msg( 
'proofreadpage_page_status' )
-   ->title( $this->getTitle() )->parse() .
-   Html::closeElement( 'label' );
-   $checkboxes['wpr-pageStatus'] = new OOUI\Widget(
-   [ 'content' => new OOUI\HtmlSnippet( $content ) 
]
-   );
-   }
-
-   return $checkboxes;
+   $content =
+   Html::openElement( 'span', [ 'id' => 
'wpQuality-container' ] ) .
+   $html .
+   Html::closeElement( 'span' ) .
+   Html::OpenElement( 'label', [ 'for' => 
'wpQuality-container' ] ) .
+   $this->context->msg( 'proofreadpage_page_status' )
+   ->title( $this->getTitle() )->parse() .
+   Html::closeElement( 'label' );
+   return new OOUI\Widget(
+   [ 'content' => new OOUI\HtmlSnippet( $content ) ]
+   );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/376884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38147fea55b38180b18b625a43ae8a5bf05a766e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.30.0-wmf.17]: Restore page status buttons

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376667 )

Change subject: Restore page status buttons
..

Restore page status buttons

EditPage::getCheckboxes() is deprecated and not really called anymore.
So override EditPage::getCheckboxesWidget() instead, and just fit the
generated HTML into a generic OOUI widget.

Bug: T175304
Change-Id: I6b0abfbdd2ce1fe7d200365af0a9b26df26edebc
---
M includes/page/EditPagePage.php
1 file changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/67/376667/1

diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index b6c4dc4..cb9eaeb 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -7,6 +7,7 @@
 use EditPage;
 use Html;
 use MWException;
+use OOUI;
 use ProofreadPage\Context;
 use ProofreadPagePage;
 use Status;
@@ -145,9 +146,9 @@
/**
 * Sets the checkboxes for the proofreading status of the page.
 *
-* @see EditPage::getCheckBoxes
+* @see EditPage::getCheckboxesWidget
 */
-   public function getCheckBoxes( &$tabindex, $checked ) {
+   public function getCheckboxesWidget( &$tabindex, $checked ) {
$oldLevel = $this->getCurrentContent()->getLevel();
 
$content = $this->toEditContent( $this->textbox1 );
@@ -155,7 +156,7 @@
 
$qualityLevels = [ 0, 2, 1, 3, 4 ];
$html = '';
-   $checkboxes = parent::getCheckBoxes( $tabindex, $checked );
+   $checkboxes = parent::getCheckboxesWidget( $tabindex, $checked 
);
$user = $this->context->getUser();
 
foreach ( $qualityLevels as $level ) {
@@ -180,9 +181,9 @@
Html::closeElement( 'span' );
}
 
-   $checkboxes['wpr-pageStatus'] = '';
+   $checkboxes['wpr-pageStatus'] = new OOUI\Widget( [ 'content' => 
new OOUI\HtmlSnippet( '' ) ] );
if ( $user->isAllowed( 'pagequality' ) ) {
-   $checkboxes['wpr-pageStatus'] =
+   $content =
Html::openElement( 'span', [ 'id' => 
'wpQuality-container' ] ) .
$html .
Html::closeElement( 'span' ) .
@@ -190,6 +191,9 @@
$this->context->msg( 
'proofreadpage_page_status' )
->title( $this->getTitle() )->parse() .
Html::closeElement( 'label' );
+   $checkboxes['wpr-pageStatus'] = new OOUI\Widget(
+   [ 'content' => new OOUI\HtmlSnippet( $content ) 
]
+   );
}
 
return $checkboxes;

-- 
To view, visit https://gerrit.wikimedia.org/r/376667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b0abfbdd2ce1fe7d200365af0a9b26df26edebc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Simplifies OO.ui.infuse call

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376216 )

Change subject: Simplifies OO.ui.infuse call
..

Simplifies OO.ui.infuse call

Change-Id: I4a47f89b7dcffce93d8be8aeddfd32043a27796a
---
M modules/index/ext.proofreadpage.index.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/16/376216/1

diff --git a/modules/index/ext.proofreadpage.index.js 
b/modules/index/ext.proofreadpage.index.js
index 87fa4c2..9a37f8d 100644
--- a/modules/index/ext.proofreadpage.index.js
+++ b/modules/index/ext.proofreadpage.index.js
@@ -1,7 +1,7 @@
 mw.loader.using( 'oojs-ui-core' ).done( function () {
$( function () {
-   $( '.prp-fieldLayout-help' ).map( function ( _, e ) {
-   return OO.ui.infuse( e.id );
+   $( '.prp-fieldLayout-help' ).map( function () {
+   return OO.ui.infuse( this );
} );
} );
 } );

-- 
To view, visit https://gerrit.wikimedia.org/r/376216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a47f89b7dcffce93d8be8aeddfd32043a27796a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: pp_index table is not private

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375347 )

Change subject: pp_index table is not private
..

pp_index table is not private

Bug: T113842
Change-Id: I37756dbf17d6fd5a44c8990ec30259f1443494bd
---
M manifests/realm.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/375347/1

diff --git a/manifests/realm.pp b/manifests/realm.pp
index 739..2ada11f 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -198,7 +198,6 @@
 'old_growth',
 'oldimage_old',
 'optin_survey',
-'pr_index',
 'prefstats',
 'prefswitch_survey',
 'profiling',

-- 
To view, visit https://gerrit.wikimedia.org/r/375347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37756dbf17d6fd5a44c8990ec30259f1443494bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikisource[master]: Adds all the MediaWiki extensions usual boilerplate

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373597 )

Change subject: Adds all the MediaWiki extensions usual boilerplate
..

Adds all the MediaWiki extensions usual boilerplate

Change-Id: Ie08909f4e20155649de7f95452b67f9d5f7a5d10
---
A .eslintrc.json
A .gitignore
A .jscsrc
A .jshintignore
A .jshintrc
A .stylelintrc
A CODE_OF_CONDUCT.md
A COPYING
A Gruntfile.js
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
A package.json
A phpcs.xml
15 files changed, 522 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikisource 
refs/changes/97/373597/1

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..bf3d404
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,16 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true
+   },
+   "globals": {
+   "OO": false,
+   "mediaWiki": false,
+   "mw": false,
+   "ve": false
+   },
+   "rules": {
+   "dot-notation": [ "error", { "allowKeywords": true } ]
+   }
+}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..21db03c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*~
+*.kate-swp
+.*.swp
+.htaccess
+/node_modules/
+/vendor/
+/composer.lock
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..023541b
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,21 @@
+{
+   "preset": "wikimedia",
+
+   "jsDoc": {
+   "checkAnnotations": {
+   "preset": "jsduck5",
+   "extra": {
+   "this": "some",
+   "source": "some",
+   "see": "some"
+   }
+   },
+   "checkTypes": "strictNativeCase",
+   "checkParamNames": true,
+   "checkRedundantAccess": true,
+   "checkRedundantReturns": true,
+   "requireNewlineAfterDescription": true,
+   "requireParamTypes": true,
+   "requireReturnTypes": true
+   }
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..4513972
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,3 @@
+modules/jquery/**
+node_modules/**
+vendor/**
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..1a54bf2
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,21 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "freeze": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+
+   // Environment
+   "jquery": true,
+   "browser": true,
+
+   "globals": {
+   "mw": false,
+   "OO": false,
+   "ve": false
+   }
+}
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 000..2c90730
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+   "extends": "stylelint-config-wikimedia"
+}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000..d8e5d08
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Moves edit validation to the Content interface implementation

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372566 )

Change subject: Moves edit validation to the Content interface implementation
..

Moves edit validation to the Content interface implementation

Cleans also some details related to ContentHandler

Change-Id: I98f2527209651b6c520db1e3da1453e031b0c712
---
M ProofreadPage.body.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/index/EditIndexPage.php
M includes/index/IndexContent.php
M includes/index/IndexContentHandler.php
M includes/page/EditPagePage.php
M includes/page/PageContent.php
M includes/page/PageContentHandler.php
M tests/phpunit/index/IndexContentHandlerTest.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageContentHandlerTest.php
M tests/phpunit/page/PageContentTest.php
15 files changed, 240 insertions(+), 214 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/66/372566/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..736e612 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -607,58 +607,6 @@
}
 
/**
-* Make validation of the content in the edit API
-*
-* @param IContextSource $context
-* @param Content $content Content of the edit box.
-* @param Status $status Status object to represent errors, etc.
-* @param string $summary Edit summary for page.
-* @param User $user User who is performing the edit.
-* @param bool $minoredit Whether the edit was marked as minor by the 
user.
-* @return bool
-*/
-   public static function onEditFilterMergedContent( IContextSource 
$context, Content $content,
-   Status $status, $summary, User $user, $minoredit
-   ) {
-   // If the content's model isn't ours, ignore this; there's 
nothing for us to do here.
-   if ( !( $content instanceof PageContent ) ) {
-   return true;
-   }
-
-   // Fail if the content is invalid, or the level is being 
removed.
-   if ( !$content->isValid() ) {
-   $status->fatal( 'proofreadpage_badpagetext' );
-   return false;
-   }
-
-   $oldContent = $context->getWikiPage()->getContent( 
Revision::FOR_THIS_USER, $user );
-   if ( $oldContent === null ) {
-   $oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )
-   ->makeEmptyContent();
-   }
-   if ( $oldContent->getModel() !== CONTENT_MODEL_PROOFREAD_PAGE ) 
{
-   // Let's convert it to Page: page content
-   $oldContent = $oldContent->convert( 
CONTENT_MODEL_PROOFREAD_PAGE );
-   }
-   if ( !( $oldContent instanceof PageContent ) ) {
-   // We consider it as a page creation
-   $oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )
-   ->makeEmptyContent();
-   }
-
-   $oldLevel = $oldContent->getLevel();
-   $newLevel = $content->getLevel();
-
-   // Fail if the user changed the level and the change isn't 
allowed
-   if ( !$oldLevel->isChangeAllowed( $newLevel ) ) {
-   $status->fatal( 'proofreadpage_notallowedtext' );
-   return false;
-   }
-
-   return true;
-   }
-
-   /**
 * Provides text for preload API
 *
 * @param string $text
@@ -901,16 +849,11 @@
 * Extension registration callback
 */
public static function onRegister() {
-   global $wgContentHandlers;
-
// L10n
include_once __DIR__ . '/ProofreadPage.namespaces.php';
 
// Content handler
define( 'CONTENT_MODEL_PROOFREAD_PAGE', 'proofread-page' );
define( 'CONTENT_MODEL_PROOFREAD_INDEX', 'proofread-index' );
-   $wgContentHandlers[CONTENT_MODEL_PROOFREAD_PAGE] = 
'\ProofreadPage\Page\PageContentHandler';
-   $wgContentHandlers[CONTENT_MODEL_PROOFREAD_INDEX] =
-   '\ProofreadPage\Index\IndexContentHandler';
}
 }
diff --git a/extension.json b/extension.json
index 042b62b..56189d8 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,10 @@
"APIPropModules": {
"proofread": "ApiQueryProofread"
},
+   "ContentHandlers": {
+   "proofread-page": "\\ProofreadPage\\Page\\PageContentHandler",
+   "proofread-index": "\\ProofreadPage\\Index\\IndexContentHandler"
+   },
"MessagesDirs": {
  

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Avoids a stack overflow

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372565 )

Change subject: Avoids a stack overflow
..

Avoids a stack overflow

The cause of this error is that CustomIndexFieldsParser
setup by the context relies on the ContentHandler system
and the ContentHandler default model hook relies on Context.

Bug: T173520
Change-Id: Ibe065a8df9e7fa49b85a789b59f3d3569a87eb8a
---
M ProofreadPage.body.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/65/372565/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..dbae3ab 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -25,6 +25,7 @@
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
 use ProofreadPage\Pagination\PageNotInPaginationException;
+use ProofreadPage\ProofreadPageInit;
 
 /*
  @todo :
@@ -41,7 +42,7 @@
 * @return int
 */
public static function getPageNamespaceId() {
-   return Context::getDefaultContext()->getPageNamespaceId();
+   return ProofreadPageInit::getNamespaceId( 'page' );
}
 
/**
@@ -52,7 +53,7 @@
 * @return int
 */
public static function getIndexNamespaceId() {
-   return Context::getDefaultContext()->getIndexNamespaceId();
+   return ProofreadPageInit::getNamespaceId( 'index' );
}
 
/**
@@ -89,6 +90,7 @@
 * @return bool if we have to continue the research for a content 
handler
 */
public static function onContentHandlerDefaultModelFor( Title $title, 
&$model ) {
+   // Warning: do not use Context here because it assumes 
ContentHandler is already initialized
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
$model = CONTENT_MODEL_PROOFREAD_PAGE;
return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/372565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe065a8df9e7fa49b85a789b59f3d3569a87eb8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Moves ProofreaPagePage::getPageNumber to FileProvider

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371658 )

Change subject: Moves ProofreaPagePage::getPageNumber to FileProvider
..

Moves ProofreaPagePage::getPageNumber to FileProvider

Change-Id: I8b2e6d02582961ff1d988d6c6418b15f69db7a96
---
M ProofreadPage.body.php
M extension.json
M includes/FileProvider.php
A includes/PageNumberNotFoundException.php
M includes/Pagination/FilePagination.php
M includes/page/PageContentBuilder.php
M includes/page/PageDisplayHandler.php
M includes/page/ProofreadPagePage.php
M tests/phpunit/FileProviderTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
10 files changed, 81 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/58/371658/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 5f8eb39..882b69d 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -21,9 +21,9 @@
 
 use ProofreadPage\Context;
 use ProofreadPage\FileNotFoundException;
-use ProofreadPage\Index\EditIndexPage;
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
+use ProofreadPage\PageNumberNotFoundException;
 use ProofreadPage\Pagination\PageNotInPaginationException;
 
 /*
@@ -760,16 +760,19 @@
 
// Image link
try {
-   $image = 
Context::getDefaultContext()->getFileProvider()->getForPagePage( $page );
+   $fileProvider = 
Context::getDefaultContext()->getFileProvider();
+   $image = $fileProvider->getForPagePage( $page );
$imageUrl = null;
if ( $image->isMultipage() ) {
$transformAttributes = [
'width' => $image->getWidth()
];
-   $pageNumber = $page->getPageNumber();
-   if ( $pageNumber !== null ) {
-   $transformAttributes['page'] = 
$pageNumber;
+   try {
+   $transformAttributes['page'] = 
$fileProvider->getPageNumberForPagePage( $page );
+   } catch ( PageNumberNotFoundException $e ) {
+   // We do not care
}
+
$handler = $image->getHandler();
if ( $handler && $handler->normaliseParams( 
$image, $transformAttributes ) ) {
$thumbName = $image->thumbName( 
$transformAttributes );
@@ -788,8 +791,7 @@
'text' => wfMessage( 
'proofreadpage_image' )->plain()
];
}
-   }
-   catch ( FileNotFoundException $e ) {
+   } catch ( FileNotFoundException $e ) {
}
 
// Prev, Next and Index links
diff --git a/extension.json b/extension.json
index 0ecd250..6b79dab 100644
--- a/extension.json
+++ b/extension.json
@@ -45,6 +45,7 @@
"ProofreadPage\\ProofreadPageInit": 
"includes/ProofreadPageInit.php",
"ProofreadPage\\DiffFormatterUtils": 
"includes/DiffFormatterUtils.php",
"ProofreadPage\\FileNotFoundException": 
"includes/FileNotFoundException.php",
+   "ProofreadPage\\PageNumberNotFoundException": 
"includes/PageNumberNotFoundException.php",
"ProofreadPage\\FileProvider": "includes/FileProvider.php",
"ProofreadPage\\Link": "includes/Link.php",
"ProofreadIndexPage": "includes/index/ProofreadIndexPage.php",
diff --git a/includes/FileProvider.php b/includes/FileProvider.php
index dea9d38..be1 100644
--- a/includes/FileProvider.php
+++ b/includes/FileProvider.php
@@ -63,4 +63,20 @@
Title::makeTitle( NS_FILE, strtok( 
$page->getTitle()->getText(), '/' ) )
);
}
+
+   /**
+* @param ProofreadPagePage $page
+* @return int
+* @throws PageNumberNotFoundException
+*/
+   public function getPageNumberForPagePage( ProofreadPagePage $page ) {
+   $parts = explode( '/', $page->getTitle()->getText() );
+   if ( count( $parts ) === 1 ) {
+   throw new PageNumberNotFoundException(
+   $page->getTitle()->getFullText() . ' does not 
provide a page number.'
+   );
+   }
+   return (int)$page->getTitle()->getPageLanguage()
+   ->parseFormattedNumber( $parts[count( $parts ) - 1] );
+   }
 }
diff --git a/includes/PageNumberNotFoundException.php 
b/includes/PageNumberNotFoundException.php
new file mode 100644
index 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Moves edit validation to the Content interface implementation

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371649 )

Change subject: Moves edit validation to the Content interface implementation
..

Moves edit validation to the Content interface implementation

Change-Id: I4277bd4920aee599280109f448558c858a165ac8
---
M ProofreadPage.body.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/index/EditIndexPage.php
M includes/index/IndexContent.php
M includes/page/EditPagePage.php
M includes/page/PageContent.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageContentHandlerTest.php
M tests/phpunit/page/PageContentTest.php
12 files changed, 191 insertions(+), 201 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/49/371649/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..72acd4c 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -607,58 +607,6 @@
}
 
/**
-* Make validation of the content in the edit API
-*
-* @param IContextSource $context
-* @param Content $content Content of the edit box.
-* @param Status $status Status object to represent errors, etc.
-* @param string $summary Edit summary for page.
-* @param User $user User who is performing the edit.
-* @param bool $minoredit Whether the edit was marked as minor by the 
user.
-* @return bool
-*/
-   public static function onEditFilterMergedContent( IContextSource 
$context, Content $content,
-   Status $status, $summary, User $user, $minoredit
-   ) {
-   // If the content's model isn't ours, ignore this; there's 
nothing for us to do here.
-   if ( !( $content instanceof PageContent ) ) {
-   return true;
-   }
-
-   // Fail if the content is invalid, or the level is being 
removed.
-   if ( !$content->isValid() ) {
-   $status->fatal( 'proofreadpage_badpagetext' );
-   return false;
-   }
-
-   $oldContent = $context->getWikiPage()->getContent( 
Revision::FOR_THIS_USER, $user );
-   if ( $oldContent === null ) {
-   $oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )
-   ->makeEmptyContent();
-   }
-   if ( $oldContent->getModel() !== CONTENT_MODEL_PROOFREAD_PAGE ) 
{
-   // Let's convert it to Page: page content
-   $oldContent = $oldContent->convert( 
CONTENT_MODEL_PROOFREAD_PAGE );
-   }
-   if ( !( $oldContent instanceof PageContent ) ) {
-   // We consider it as a page creation
-   $oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )
-   ->makeEmptyContent();
-   }
-
-   $oldLevel = $oldContent->getLevel();
-   $newLevel = $content->getLevel();
-
-   // Fail if the user changed the level and the change isn't 
allowed
-   if ( !$oldLevel->isChangeAllowed( $newLevel ) ) {
-   $status->fatal( 'proofreadpage_notallowedtext' );
-   return false;
-   }
-
-   return true;
-   }
-
-   /**
 * Provides text for preload API
 *
 * @param string $text
diff --git a/extension.json b/extension.json
index 042b62b..20b2081 100644
--- a/extension.json
+++ b/extension.json
@@ -88,9 +88,6 @@
"ApiQueryProofreadInfo": "ApiQueryProofreadInfo.php",
"ProofreadPage\\FileProviderMock": 
"tests/phpunit/FileProviderMock.php",
"ProofreadPageTestCase": 
"tests/phpunit/ProofreadPageTestCase.php",
-   "ProofreadIndexPageTest": 
"tests/phpunit/index/ProofreadIndexPageTest.php",
-   "ProofreadPagePageTest": 
"tests/phpunit/page/ProofreadPagePageTest.php",
-   "ProofreadPage\\Page\\PageContentTest": 
"tests/phpunit/page/PageContentTest.php",
"FixProofreadPagePagesContentModel": 
"maintenance/fixProofreadPagePagesContentModel.php",
"FixProofreadIndexPagesContentModel": 
"maintenance/fixProofreadIndexPagesContentModel.php"
},
@@ -298,9 +295,6 @@
],
"ContentHandlerDefaultModelFor": [
"ProofreadPage::onContentHandlerDefaultModelFor"
-   ],
-   "EditFilterMergedContent": [
-   "ProofreadPage::onEditFilterMergedContent"
],
"EditFormPreloadText": [
"ProofreadPage::onEditFormPreloadText"
diff --git a/i18n/en.json b/i18n/en.json
index 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: [WIP] Introduces IndexForPageLookup

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371611 )

Change subject: [WIP] Introduces IndexForPageLookup
..

[WIP] Introduces IndexForPageLookup

Change-Id: Ibf1f16c8fb27073fb6cade19c0d1f4d676a513fc
---
M ProofreadPage.body.php
M extension.json
M includes/Context.php
M includes/Pagination/FilePagination.php
A includes/page/IndexForPageLookup.php
M includes/page/PageContentBuilder.php
M includes/page/PageDisplayHandler.php
M includes/page/ProofreadPagePage.php
M tests/phpunit/ContextTest.php
A tests/phpunit/page/IndexForPageLookupTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
11 files changed, 170 insertions(+), 83 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/11/371611/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..5f8eb39 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -793,8 +793,8 @@
}
 
// Prev, Next and Index links
-   $indexPage = $page->getIndex();
-   if ( $indexPage ) {
+   $indexPage = 
Context::getDefaultContext()->getIndexForPageLookup()->getIndexForPage( $page );
+   if ( $indexPage !== null ) {
$pagination = Context::getDefaultContext()

->getPaginationFactory()->getPaginationForIndexPage( $indexPage );
try {
diff --git a/extension.json b/extension.json
index 042b62b..5fdb723 100644
--- a/extension.json
+++ b/extension.json
@@ -77,6 +77,7 @@
"ProofreadPage\\Page\\PageViewAction": 
"includes/page/PageViewAction.php",
"ProofreadPage\\Page\\PageDifferenceEngine": 
"includes/page/PageDifferenceEngine.php",
"ProofreadPage\\Page\\PageDisplayHandler": 
"includes/page/PageDisplayHandler.php",
+   "ProofreadPage\\Page\\IndexForPageLookup": 
"includes/page/IndexForPageLookup.php",
"ProofreadPage\\Parser\\ParserEntryPoint": 
"includes/Parser/ParserEntryPoint.php",
"ProofreadPage\\Parser\\TagParser": 
"includes/Parser/TagParser.php",
"ProofreadPage\\Parser\\PagelistTagParser": 
"includes/Parser/PagelistTagParser.php",
diff --git a/includes/Context.php b/includes/Context.php
index 0bbd60d..78f9da0 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -3,6 +3,7 @@
 namespace ProofreadPage;
 
 use ProofreadPage\Index\CustomIndexFieldsParser;
+use ProofreadPage\Page\IndexForPageLookup;
 use ProofreadPage\Pagination\PaginationFactory;
 use RepoGroup;
 
@@ -38,6 +39,11 @@
private $customIndexFieldsParser;
 
/**
+* @var IndexForPageLookup
+*/
+   private $indexForPageLookup;
+
+   /**
 * @param int $pageNamespaceId
 * @param int $indexNamespaceId
 * @param FileProvider $fileProvider
@@ -51,6 +57,7 @@
$this->indexNamespaceId = $indexNamespaceId;
$this->fileProvider = $fileProvider;
$this->customIndexFieldsParser = $customIndexFieldsParser;
+   $this->indexForPageLookup = new IndexForPageLookup( 
$indexNamespaceId );
}
 
/**
@@ -89,6 +96,13 @@
}
 
/**
+* @return IndexForPageLookup
+*/
+   public function getIndexForPageLookup() {
+   return $this->indexForPageLookup;
+   }
+
+   /**
 * @param bool $purgeFileProvider
 * @return Context
 */
diff --git a/includes/Pagination/FilePagination.php 
b/includes/Pagination/FilePagination.php
index 48a6e7a..524d85a 100644
--- a/includes/Pagination/FilePagination.php
+++ b/includes/Pagination/FilePagination.php
@@ -60,8 +60,8 @@
 */
public function getPageNumber( ProofreadPagePage $page ) {
$pageNumber = $page->getPageNumber();
-   $index = $page->getIndex();
-   if ( $pageNumber === null || $index === false || 
!$this->index->equals( $index ) ) {
+   $index = 
$this->context->getIndexForPageLookup()->getIndexForPage( $page );
+   if ( $pageNumber === null || $index === null || 
!$this->index->equals( $index ) ) {
throw new PageNotInPaginationException( '$page does not 
belong to the pagination' );
}
return $pageNumber;
diff --git a/includes/page/IndexForPageLookup.php 
b/includes/page/IndexForPageLookup.php
new file mode 100644
index 000..375d158
--- /dev/null
+++ b/includes/page/IndexForPageLookup.php
@@ -0,0 +1,98 @@
+indexNamespaceId = $indexNamespaceId;
+   }
+
+   /**
+* Return index of the page
+* @param ProofreadPagePage $page
+* @return ProofreadIndexPage|null
+*/
+   public function getIndexForPage( ProofreadPagePage $page ) {
+   $cacheKey = 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Refactors TagParsers

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371484 )

Change subject: Refactors TagParsers
..

Refactors TagParsers

Change-Id: I5234dd05280af661c5ca7e00b3116eb8d4415e15
---
M ProofreadPage.body.php
M extension.json
M includes/Context.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PaginationFactory.php
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagequalityTagParser.php
M includes/Parser/PagesTagParser.php
D includes/Parser/ParserEntryPoint.php
D includes/Parser/TagParser.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
12 files changed, 170 insertions(+), 160 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/84/371484/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 56b01ed..7571830 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -21,10 +21,12 @@
 
 use ProofreadPage\Context;
 use ProofreadPage\FileNotFoundException;
-use ProofreadPage\Index\EditIndexPage;
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
 use ProofreadPage\Pagination\PageNotInPaginationException;
+use ProofreadPage\Parser\PagelistTagParser;
+use ProofreadPage\Parser\PagequalityTagParser;
+use ProofreadPage\Parser\PagesTagParser;
 
 /*
  @todo :
@@ -107,13 +109,25 @@
 * @return bool hook return value
 */
public static function onParserFirstCallInit( Parser $parser ) {
-   $parser->setHook(
-   'pagelist', [ 'ProofreadPage\Parser\ParserEntryPoint', 
'renderPagelistTag' ]
-   );
-   $parser->setHook( 'pages', [ 
'ProofreadPage\Parser\ParserEntryPoint', 'renderPagesTag' ] );
-   $parser->setHook(
-   'pagequality', [ 
'ProofreadPage\Parser\ParserEntryPoint', 'renderPagequalityTag' ]
-   );
+   $context = Context::getDefaultContext( true );
+   $parser->setHook( 'pagelist', function ( $input, array $args, 
Parser $parser ) use ( $context ) {
+   $tagParser = new PagelistTagParser( $parser,
+   $context->getPageNamespaceId(), 
$context->getIndexNamespaceId(), $context->getFileProvider()
+   );
+   return $tagParser->render( $input, $args );
+   } );
+   $parser->setHook( 'pages', function ( $input, array $args, 
Parser $parser ) use ( $context ) {
+   $tagParser = new PagesTagParser( $parser,
+   $context->getPageNamespaceId(), 
$context->getIndexNamespaceId(),
+   $context->getPaginationFactory(), 
$context->getCustomIndexFieldsParser()
+   );
+   return $tagParser->render( $input, $args );
+   } );
+   $parser->setHook( 'pagequality',
+   function ( $input, array $args, Parser $parser ) use ( 
$context ) {
+   $tagParser = new PagequalityTagParser();
+   return $tagParser->render( $input, $args );
+} );
return true;
}
 
diff --git a/extension.json b/extension.json
index 266871c..aef8046 100644
--- a/extension.json
+++ b/extension.json
@@ -76,8 +76,6 @@
"ProofreadPage\\Page\\PageViewAction": 
"includes/page/PageViewAction.php",
"ProofreadPage\\Page\\PageDifferenceEngine": 
"includes/page/PageDifferenceEngine.php",
"ProofreadPage\\Page\\PageDisplayHandler": 
"includes/page/PageDisplayHandler.php",
-   "ProofreadPage\\Parser\\ParserEntryPoint": 
"includes/Parser/ParserEntryPoint.php",
-   "ProofreadPage\\Parser\\TagParser": 
"includes/Parser/TagParser.php",
"ProofreadPage\\Parser\\PagelistTagParser": 
"includes/Parser/PagelistTagParser.php",
"ProofreadPage\\Parser\\PagesTagParser": 
"includes/Parser/PagesTagParser.php",
"ProofreadPage\\Parser\\PagequalityTagParser": 
"includes/Parser/PagequalityTagParser.php",
diff --git a/includes/Context.php b/includes/Context.php
index 0bbd60d..71d7dce 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -33,6 +33,11 @@
private $fileProvider;
 
/**
+* @var PaginationFactory
+*/
+   private $paginationFactory;
+
+   /**
 * @var CustomIndexFieldsParser
 */
private $customIndexFieldsParser;
@@ -50,6 +55,7 @@
$this->pageNamespaceId = $pageNamespaceId;
$this->indexNamespaceId = $indexNamespaceId;
$this->fileProvider = $fileProvider;
+   $this->paginationFactory = new PaginationFactory( 
$pageNamespaceId, $fileProvider );

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes unit test namespace ids independent

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371469 )

Change subject: Makes unit test namespace ids independent
..

Makes unit test namespace ids independent

Change-Id: I2b64e6a2725992ce1524b3c73479f12b351e2d91
---
M tests/phpunit/FileProviderTest.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PagePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
M tests/phpunit/ProofreadPageTestCase.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/index/IndexRedirectContentTest.php
M tests/phpunit/index/ProofreadIndexPageTest.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageContentTest.php
M tests/phpunit/page/PageDisplayHandlerTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
12 files changed, 123 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/69/371469/1

diff --git a/tests/phpunit/FileProviderTest.php 
b/tests/phpunit/FileProviderTest.php
index 3ebcdf4..85d5786 100644
--- a/tests/phpunit/FileProviderTest.php
+++ b/tests/phpunit/FileProviderTest.php
@@ -37,7 +37,7 @@
 
return [
[
-   ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum.djvu' ) ),
+   $this->newIndexPage( 'LoremIpsum.djvu' ),
$this->getFileFromName( 'LoremIpsum.djvu' ),
$fileProvider
],
@@ -62,11 +62,11 @@
 
return [
[
-   ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum2.djvu' ) ),
+   $this->newIndexPage( 'LoremIpsum2.djvu' ),
$fileProvider
],
[
-   ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'Test' ) ),
+   $this->newIndexPage( 'Test' ),
$fileProvider
],
];
@@ -89,24 +89,22 @@
 
return [
[
-   ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu/4' ) ),
+   $this->newPagePage( 'LoremIpsum.djvu/4' ),
$this->getFileFromName( 'LoremIpsum.djvu' ),
$fileProvider
],
[
-   ProofreadPagePage::newFromTitle(
-   Title::makeTitle( 250, 
'LoremIpsum.djvu/djvu/1' )
-   ),
+   $this->newPagePage( 'LoremIpsum.djvu/djvu/1' ),
$this->getFileFromName( 'LoremIpsum.djvu' ),
$fileProvider
],
[
-   ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu' ) ),
+   $this->newPagePage( 'LoremIpsum.djvu' ),
$this->getFileFromName( 'LoremIpsum.djvu' ),
$fileProvider
],
[
-   ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'Test.jpg' ) ),
+   $this->newPagePage( 'Test.jpg' ),
$this->getFileFromName( 'Test.jpg' ),
$fileProvider
],
@@ -131,11 +129,11 @@
 
return [
[
-   ProofreadPagePage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum2.djvu/4' ) ),
+   $this->newPagePage( 'LoremIpsum2.djvu/4' ),
$fileProvider
],
[
-   ProofreadPagePage::newFromTitle( 
Title::makeTitle( 252, 'Test' ) ),
+   $this->newPagePage( 'Test' ),
$fileProvider
],
];
diff --git a/tests/phpunit/Pagination/FilePaginationTest.php 
b/tests/phpunit/Pagination/FilePaginationTest.php
index b17be7f..dadd19a 100644
--- a/tests/phpunit/Pagination/FilePaginationTest.php
+++ b/tests/phpunit/Pagination/FilePaginationTest.php
@@ -5,7 +5,6 @@
 use InvalidArgumentException;
 use MediaHandler;
 use OutOfBoundsException;
-use ProofreadIndexPageTest;
 use ProofreadPagePage;
 use ProofreadPageTestCase;
 use Title;
@@ -17,7 +16,7 @@
 class FilePaginationTest extends ProofreadPageTestCase {
 
public function testGetPageNumber() 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Guess Page: pages content format if not given

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371208 )

Change subject: Guess Page: pages content format if not given
..

Guess Page: pages content format if not given

Change-Id: Ia6082626231da5894e8164a3012f9eade7ceb3b5
---
M includes/page/PageContentHandler.php
M tests/phpunit/page/PageContentHandlerTest.php
2 files changed, 13 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/08/371208/1

diff --git a/includes/page/PageContentHandler.php 
b/includes/page/PageContentHandler.php
index d86cf58..901de41 100644
--- a/includes/page/PageContentHandler.php
+++ b/includes/page/PageContentHandler.php
@@ -6,6 +6,7 @@
 use ContentHandler;
 use FormatJson;
 use MWContentSerializationException;
+use MWException;
 use TextContentHandler;
 use Title;
 use User;
@@ -87,19 +88,28 @@
 * @see ContentHandler::unserializeContent
 */
public function unserializeContent( $text, $format = null ) {
-   $this->checkFormat( $format );
+   if ( $format === null ) {
+   $format = ( FormatJson::decode( $text, true ) === null )
+   ? CONTENT_FORMAT_WIKITEXT
+   : CONTENT_FORMAT_JSON;
+   }
 
switch ( $format ) {
case CONTENT_FORMAT_JSON:
return $this->unserializeContentInJson( $text );
-   default:
+   case CONTENT_FORMAT_WIKITEXT:
return $this->unserializeContentInWikitext( 
$text );
+   default:
+   throw new MWException(
+   "Format ' . $format . ' is not 
supported for content model " . $this->getModelID()
+   );
}
}
 
/**
 * @param string $text
 * @return PageContent
+* @throws MWContentSerializationException
 */
private function unserializeContentInJson( $text ) {
$array = FormatJson::decode( $text, true );
diff --git a/tests/phpunit/page/PageContentHandlerTest.php 
b/tests/phpunit/page/PageContentHandlerTest.php
index bd4cccb..f29eca8 100644
--- a/tests/phpunit/page/PageContentHandlerTest.php
+++ b/tests/phpunit/page/PageContentHandlerTest.php
@@ -196,7 +196,7 @@
) {
$this->assertEquals(
PageContentTest::newContent( $header, $body, $footer, 
$level, $proofreader ),
-   $this->handler->unserializeContent( $text, 
CONTENT_FORMAT_JSON )
+   $this->handler->unserializeContent( $text )
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/371208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6082626231da5894e8164a3012f9eade7ceb3b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Implements a difference engine for Index: pages

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371136 )

Change subject: Implements a difference engine for Index: pages
..

Implements a difference engine for Index: pages

Change-Id: I8a29d94022ff86c9823414e7bae1ab8ce0f63b13
---
M extension.json
M includes/index/IndexContentHandler.php
A includes/index/IndexDifferenceEngine.php
M includes/page/PageDifferenceEngine.php
4 files changed, 103 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/36/371136/1

diff --git a/extension.json b/extension.json
index 266871c..042b62b 100644
--- a/extension.json
+++ b/extension.json
@@ -53,6 +53,7 @@
"ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
"ProofreadPage\\Index\\IndexRedirectContent": 
"includes/index/IndexRedirectContent.php",
"ProofreadPage\\Index\\IndexContentHandler": 
"includes/index/IndexContentHandler.php",
+   "ProofreadPage\\Index\\IndexDifferenceEngine": 
"includes/index/IndexDifferenceEngine.php",
"ProofreadPage\\Index\\IndexEditAction": 
"includes/index/IndexEditAction.php",
"ProofreadPage\\Index\\IndexSubmitAction": 
"includes/index/IndexSubmitAction.php",
"ProofreadPage\\Index\\EditIndexPage": 
"includes/index/EditIndexPage.php",
diff --git a/includes/index/IndexContentHandler.php 
b/includes/index/IndexContentHandler.php
index 5d18c7f..2b1f606 100644
--- a/includes/index/IndexContentHandler.php
+++ b/includes/index/IndexContentHandler.php
@@ -129,6 +129,13 @@
}
 
/**
+* @see ContentHandler::getDiffEngineClass
+*/
+   protected function getDiffEngineClass() {
+   return '\ProofreadPage\Index\IndexDifferenceEngine';
+   }
+
+   /**
 * @see ContentHandler::makeEmptyContent
 */
public function makeEmptyContent() {
diff --git a/includes/index/IndexDifferenceEngine.php 
b/includes/index/IndexDifferenceEngine.php
new file mode 100644
index 000..5b7a654
--- /dev/null
+++ b/includes/index/IndexDifferenceEngine.php
@@ -0,0 +1,92 @@
+diffFormatterUtils = new DiffFormatterUtils();
+   $extContext = ($extContext === null) ? 
Context::getDefaultContext() : $extContext;
+   $this->customIndexFieldsParser = 
$extContext->getCustomIndexFieldsParser();
+   }
+
+   /**
+* @see DifferenceEngine::generateContentDiffBody
+*/
+   public function generateContentDiffBody( Content $old, Content $new ) {
+   if ( $old instanceof IndexRedirectContent ) {
+   if ( $new instanceof IndexRedirectContent ) {
+   return $this->createRedirectionDiff( 
$old->getRedirectTarget(), $new->getRedirectTarget() );
+   } elseif ($new instanceof IndexContent ) {
+   return $this->createRedirectionDiff( 
$old->getRedirectTarget(), null ) .
+   $this->createIndexContentDiff( null, 
$new );
+   }
+   } elseif( $old instanceof IndexContent ) {
+   if ( $new instanceof IndexRedirectContent ) {
+   return $this->createRedirectionDiff( null, 
$new->getRedirectTarget() ) .
+   $this->createIndexContentDiff( $old, 
null );
+   } elseif ($new instanceof IndexContent ) {
+   return $this->createIndexContentDiff( $old, 
$new );
+   }
+   }
+   throw new InvalidArgumentException( 'IndexDifferenceEngine is 
only able to output diffs between IndexContents' );
+   }
+
+   private function createRedirectionDiff( Title $old = null, Title $new = 
null ) {
+   $old = ($old === null) ? '' : $old->getFullText();
+   $new = ($new === null) ? '' : $new->getFullText();
+   return $this->createTextDiffOutput($old, $new,
+   $this->msg( 'isredirect' )->escaped()
+   );
+   }
+
+   private function createIndexContentDiff( IndexContent $old = null, 
IndexContent $new = null ) {
+   $oldCustomFields = ($old === null) ? [] : 
$this->customIndexFieldsParser->parseCustomIndexFields( $old );
+   $newCustomFields = ($new === null) ? [] : 
$this->customIndexFieldsParser->parseCustomIndexFields( $new );
+   $diff = '';
+   foreach ($oldCustomFields as $oldField) {
+   $diff .= $this->createTextDiffOutput(
+   $oldField->getStringValue(),
+   
$newCustomFields[$oldField->getKey()]->getStringValue(),
+   $oldField->getLabel()
+   );
+   }

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Refactors TagParsers

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371131 )

Change subject: Refactors TagParsers
..

Refactors TagParsers

Change-Id: I794beef218568e1db0c627bda0ad8f17e5f7a251
---
M ProofreadPage.body.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PaginationFactory.php
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagequalityTagParser.php
M includes/Parser/PagesTagParser.php
D includes/Parser/ParserEntryPoint.php
D includes/Parser/TagParser.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
10 files changed, 141 insertions(+), 146 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/31/371131/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index eda957a..0193fd0 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -21,10 +21,12 @@
 
 use ProofreadPage\Context;
 use ProofreadPage\FileNotFoundException;
-use ProofreadPage\Index\EditIndexPage;
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
 use ProofreadPage\Pagination\PageNotInPaginationException;
+use ProofreadPage\Parser\PagelistTagParser;
+use ProofreadPage\Parser\PagequalityTagParser;
+use ProofreadPage\Parser\PagesTagParser;
 
 /*
  @todo :
@@ -107,13 +109,25 @@
 * @return boolean hook return value
 */
public static function onParserFirstCallInit( Parser $parser ) {
-   $parser->setHook(
-   'pagelist', [ 'ProofreadPage\Parser\ParserEntryPoint', 
'renderPagelistTag' ]
-   );
-   $parser->setHook( 'pages', [ 
'ProofreadPage\Parser\ParserEntryPoint', 'renderPagesTag' ] );
-   $parser->setHook(
-   'pagequality', [ 
'ProofreadPage\Parser\ParserEntryPoint', 'renderPagequalityTag' ]
-   );
+   $context = Context::getDefaultContext( true );
+   $parser->setHook( 'pagelist', function ( $input, array $args, 
Parser $parser ) use ( $context ) {
+   $tagParser = new PagelistTagParser( $parser,
+   $context->getPageNamespaceId(), 
$context->getIndexNamespaceId(), $context->getFileProvider()
+   );
+   return $tagParser->render( $input, $args );
+   } );
+   $parser->setHook( 'pages', function ( $input, array $args, 
Parser $parser ) use ( $context ) {
+   $tagParser = new PagesTagParser( $parser,
+   $context->getPageNamespaceId(), 
$context->getIndexNamespaceId(),
+   $context->getPaginationFactory()
+   );
+   return $tagParser->render( $input, $args );
+   } );
+   $parser->setHook( 'pagequality',
+   function ( $input, array $args, Parser $parser ) use ( 
$context ) {
+   $tagParser = new PagequalityTagParser();
+   return $tagParser->render( $input, $args );
+} );
return true;
}
 
diff --git a/includes/Pagination/FilePagination.php 
b/includes/Pagination/FilePagination.php
index 48a6e7a..7ef1990 100644
--- a/includes/Pagination/FilePagination.php
+++ b/includes/Pagination/FilePagination.php
@@ -32,23 +32,23 @@
private $pages = [];
 
/**
-* @var Context
+* @var int
 */
-   private $context;
+   private $pageNamespaceId;
 
/**
 * @param ProofreadIndexPage $index
 * @param PageList $pageList representation of the  tag that 
configure page numbers
 * @param File $file the pagination file
-* @param Context $context the current context
+* @param int $pageNamespaceId
 */
public function __construct(
-   ProofreadIndexPage $index, PageList $pageList, File $file, 
Context $context
+   ProofreadIndexPage $index, PageList $pageList, File $file, 
$pageNamespaceId
) {
parent::__construct( $index );
 
$this->pageList = $pageList;
-   $this->context = $context;
+   $this->pageNamespaceId = $pageNamespaceId;
 
if ( $file->isMultipage() ) {
$this->numberOfPages = $file->pageCount();
@@ -128,7 +128,7 @@
 */
private function buildPageTitleFromPageNumber( $pageNumber ) {
return Title::makeTitle(
-   $this->context->getPageNamespaceId(),
+   $this->pageNamespaceId,
$this->index->getTitle()->getText() . '/' . $pageNumber
);
}
diff --git a/includes/Pagination/PaginationFactory.php 
b/includes/Pagination/PaginationFactory.php

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Merge "Added a separate error message for mkdir failures"

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371101 )

Change subject: Merge "Added a separate error message for mkdir failures"
..

Merge "Added a separate error message for mkdir failures"

Change-Id: Ibd7f7e3c2dfe45e4512ce27120a76400a4526d50
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/371101/1


-- 
To view, visit https://gerrit.wikimedia.org/r/371101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd7f7e3c2dfe45e4512ce27120a76400a4526d50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes sure that parser tests works

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371015 )

Change subject: Makes sure that parser tests works
..

Makes sure that parser tests works

Change-Id: I5cd4a4485b5bf5583a4bc3cb1372c55e9eaf2845
---
M includes/index/IndexContentHandler.php
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/15/371015/1

diff --git a/includes/index/IndexContentHandler.php 
b/includes/index/IndexContentHandler.php
index a7eb709..c9d4979 100644
--- a/includes/index/IndexContentHandler.php
+++ b/includes/index/IndexContentHandler.php
@@ -38,11 +38,9 @@
}
 
private function buildParser() {
-   global $wgParser;
-   StubObject::unstub( $wgParser );
-   $parser = clone $wgParser;
+   $parser = new Parser();
$parser->startExternalParse(
-   null, $this->makeParserOptions( 'canonical' ), 
Parser::OT_PLAIN, true
+   null, $this->makeParserOptions( 'canonical' ), 
Parser::OT_PLAIN
);
return $parser;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/371015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cd4a4485b5bf5583a4bc3cb1372c55e9eaf2845
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Renders Index: pages without replying their Wikitext seriali...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370940 )

Change subject: Renders Index: pages without replying their Wikitext 
serialization
..

Renders Index: pages without replying their Wikitext serialization

Change-Id: I3f3ffcae202a08acec55061dc07a20f033fa8d69
---
M includes/index/IndexContent.php
1 file changed, 24 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/40/370940/1

diff --git a/includes/index/IndexContent.php b/includes/index/IndexContent.php
index 107915d..5fd0a01 100644
--- a/includes/index/IndexContent.php
+++ b/includes/index/IndexContent.php
@@ -4,7 +4,9 @@
 
 use Content;
 use MagicWord;
+use Parser;
 use ParserOptions;
+use ParserOutput;
 use TextContent;
 use Title;
 use User;
@@ -166,12 +168,29 @@
}
 
/**
-* @see Content::getParserOutput
+* @see AbstractContent::fillParserOutput
 */
-   public function getParserOutput(
-   Title $title, $revId = null, ParserOptions $options = null, 
$generateHtml = true
+   protected function fillParserOutput( Title $title, $revId,
+   ParserOptions $options, $generateHtml, ParserOutput &$output
) {
-   $wikitextContent = new WikitextContent( $this->serialize( 
CONTENT_FORMAT_WIKITEXT ) );
-   return $wikitextContent->getParserOutput( $title, $revId, 
$options, $generateHtml );
+   /** @var Parser $wgParser */
+   global $wgParser;
+
+   // We expand the index template
+   $wgParser->startExternalParse( $title, $options, 
Parser::OT_PREPROCESS );
+   $frame = $wgParser->getPreprocessor()->newCustomFrame( 
array_map( function ( Content $content ) {
+   return $content->serialize( CONTENT_FORMAT_WIKITEXT );
+   }, $this->fields ) );
+   $templateTitle = Title::makeTitle( NS_MEDIAWIKI, 'Proofreadpage 
index template' );
+   $templateText = $wgParser->fetchTemplate( $templateTitle );
+   $dom = $wgParser->preprocessToDom( $templateText, 
Parser::PTD_FOR_INCLUSION );
+   $text = $frame->expand( $dom );
+
+   // We do the final rendering
+   $output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
+   $output->addTemplate( $templateTitle,
+   $templateTitle->getArticleID(),
+   $templateTitle->getLatestRevID()
+   );
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/370940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f3ffcae202a08acec55061dc07a20f033fa8d69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: [VE] Considers that the full wikitext is the body if there i...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370820 )

Change subject: [VE] Considers that the full wikitext is the body if there is 
no header
..

[VE] Considers that the full wikitext is the body if there is no header

Change-Id: I915f9e902ff4d173065cc1f9e9973fe3c9d7188d
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/20/370820/1

diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 1152087..18aa9ba 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -267,7 +267,7 @@
articleNode.appendChild( sectionNodes[ i ] );
}
 
-   sectionIndex = 0;
+   sectionIndex = endHeader ? 0 : 1;
while ( doc.body.firstChild ) {
sectionNodes[ sectionIndex ].appendChild( doc.body.firstChild );
if ( sectionNodes[ sectionIndex ].lastChild === endHeader ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/370820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I915f9e902ff4d173065cc1f9e9973fe3c9d7188d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Moves all code related to Index fields management outside of...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370810 )

Change subject: Moves all code related to Index fields management outside of 
ProofreadIndexPage
..

Moves all code related to Index fields management outside of ProofreadIndexPage

Change-Id: I0bebd9b5c59d60ee5c3b810a3754954cc8d71cda
---
M extension.json
M includes/Context.php
M includes/Parser/PagesTagParser.php
R includes/index/CustomIndexField.php
A includes/index/CustomIndexFieldsParser.php
M includes/index/EditIndexPage.php
M includes/index/ProofreadIndexPage.php
M includes/page/PageContentBuilder.php
M includes/page/PageDisplayHandler.php
M tests/phpunit/ContextTest.php
M tests/phpunit/ProofreadPageTestCase.php
A tests/phpunit/index/CustomIndexFieldsParserTest.php
M tests/phpunit/index/ProofreadIndexPageTest.php
13 files changed, 605 insertions(+), 535 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/10/370810/1

diff --git a/extension.json b/extension.json
index 4f95dc1..9efbc29 100644
--- a/extension.json
+++ b/extension.json
@@ -49,6 +49,8 @@
"ProofreadPage\\Link": "includes/Link.php",
"ProofreadIndexEntry": "includes/index/ProofreadIndexEntry.php",
"ProofreadIndexPage": "includes/index/ProofreadIndexPage.php",
+   "ProofreadPage\\Index\\CustomIndexField": 
"includes/index/CustomIndexField.php",
+   "ProofreadPage\\Index\\CustomIndexFieldsParser": 
"includes/index/CustomIndexFieldsParser.php",
"ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
"ProofreadPage\\Index\\IndexRedirectContent": 
"includes/index/IndexRedirectContent.php",
"ProofreadPage\\Index\\IndexContentHandler": 
"includes/index/IndexContentHandler.php",
diff --git a/includes/Context.php b/includes/Context.php
index 5393f29..129a27d 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -2,6 +2,7 @@
 
 namespace ProofreadPage;
 
+use ProofreadPage\Index\CustomIndexFieldsParser;
 use ProofreadPage\Pagination\PaginationFactory;
 use RepoGroup;
 
@@ -32,14 +33,24 @@
private $fileProvider;
 
/**
+* @var CustomIndexFieldsParser
+*/
+   private $customIndexFieldsParser;
+
+   /**
 * @param int $pageNamespaceId
 * @param int $indexNamespaceId
 * @param FileProvider $fileProvider
+* @param CustomIndexFieldsParser $customIndexFieldsParser
 */
-   public function __construct( $pageNamespaceId, $indexNamespaceId, 
FileProvider $fileProvider ) {
+   public function __construct(
+   $pageNamespaceId, $indexNamespaceId, FileProvider $fileProvider,
+   CustomIndexFieldsParser $customIndexFieldsParser
+   ) {
$this->pageNamespaceId = $pageNamespaceId;
$this->indexNamespaceId = $indexNamespaceId;
$this->fileProvider = $fileProvider;
+   $this->customIndexFieldsParser = $customIndexFieldsParser;
}
 
/**
@@ -71,6 +82,13 @@
}
 
/**
+* @return CustomIndexFieldsParser
+*/
+   public function getCustomIndexFieldsParser() {
+   return $this->customIndexFieldsParser;
+   }
+
+   /**
 * @param bool $purgeFileProvider
 * @return Context
 */
@@ -81,7 +99,8 @@
$defaultContext = new self(
ProofreadPageInit::getNamespaceId( 'page' ),
ProofreadPageInit::getNamespaceId( 'index' ),
-   new FileProvider( RepoGroup::singleton() )
+   new FileProvider( RepoGroup::singleton() ),
+   new CustomIndexFieldsParser()
);
}
if ( $purgeFileProvider ) {
diff --git a/includes/Parser/PagesTagParser.php 
b/includes/Parser/PagesTagParser.php
index 90cabe0..5ccf5d2 100644
--- a/includes/Parser/PagesTagParser.php
+++ b/includes/Parser/PagesTagParser.php
@@ -4,6 +4,7 @@
 
 use OutOfBoundsException;
 use ProofreadIndexPage;
+use ProofreadPage\Context;
 use ProofreadPage\Pagination\FilePagination;
 use ProofreadPageDbConnector;
 use ProofreadPagePage;
@@ -62,6 +63,7 @@
return $this->formatError( 'proofreadpage_nosuch_index' 
);
}
$indexPage = ProofreadIndexPage::newFromTitle( $indexTitle );
+   $indexContent = $indexPage->getContent();
$pagination = $this->context->getPaginationFactory()
->getPaginationForIndexPage( $indexPage );
$language = $this->parser->getTargetLanguage();
@@ -263,7 +265,7 @@
if ( $header == 'toc' ) {
$this->parser->getOutput()->is_toc = 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Moves function related to display out of PageDisplayHandler

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370809 )

Change subject: Moves function related to display out of PageDisplayHandler
..

Moves function related to display out of PageDisplayHandler

Change-Id: Iac70c5b49616a18cb7a263becde0c6abe642c66b
---
M extension.json
M includes/page/EditPagePage.php
A includes/page/PageDisplayHandler.php
M includes/page/PageViewAction.php
M includes/page/ProofreadPagePage.php
A tests/phpunit/page/PageDisplayHandlerTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
7 files changed, 198 insertions(+), 162 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/09/370809/1

diff --git a/extension.json b/extension.json
index 12f9ce6..4f95dc1 100644
--- a/extension.json
+++ b/extension.json
@@ -74,6 +74,7 @@
"ProofreadPage\\Page\\PageSubmitAction": 
"includes/page/PageSubmitAction.php",
"ProofreadPage\\Page\\PageViewAction": 
"includes/page/PageViewAction.php",
"ProofreadPage\\Page\\PageDifferenceEngine": 
"includes/page/PageDifferenceEngine.php",
+   "ProofreadPage\\Page\\PageDisplayHandler": 
"includes/page/PageDisplayHandler.php",
"ProofreadPage\\Parser\\ParserEntryPoint": 
"includes/Parser/ParserEntryPoint.php",
"ProofreadPage\\Parser\\TagParser": 
"includes/Parser/TagParser.php",
"ProofreadPage\\Parser\\PagelistTagParser": 
"includes/Parser/PagelistTagParser.php",
diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index 94eb774..0458ee5 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -19,12 +19,17 @@
/**
 * @var ProofreadPagePage
 */
-   protected $pagePage;
+   private $pagePage;
 
/**
 * @var PageContentBuilder
 */
-   protected $pageContentBuilder;
+   private $pageContentBuilder;
+
+   /**
+* @var Context
+*/
+   private $extContext;
 
/**
 * @param Article $article
@@ -37,12 +42,7 @@
 
$this->pagePage = $pagePage;
$this->pageContentBuilder = new PageContentBuilder( 
$this->context, $context );
-
-   if ( !$this->isSupportedContentModel( $this->contentModel ) ) {
-   throw new MWException(
-   "The content model {$this->contentModel} is not 
supported"
-   );
-   }
+   $this->extContext = $context;
}
 
/**
@@ -76,9 +76,10 @@
 */
protected function showContentForm() {
$out = $this->context->getOutput();
+   $pageDisplayHandler = new PageDisplayHandler( $this->extContext 
);
 
// custom CSS for preview
-   $css = $this->pagePage->getCustomCss();
+   $css = $pageDisplayHandler->getCustomCss( $this->pagePage );
if ( $css !== '' ) {
$out->addInlineStyle( $css );
}
@@ -90,7 +91,7 @@
 
$content = $this->toEditContent( $this->textbox1 );
 
-   $out->addHTML( $this->pagePage->getPageContainerBegin() );
+   $out->addHTML( $pageDisplayHandler->buildPageContainerBegin() );
$this->showEditArea(
'wpHeaderTextbox',
'prp-page-edit-header',
@@ -113,7 +114,7 @@
$inputAttributes + [ 'rows' => '2', 'tabindex' => '1' ]
);
// the 3 textarea tabindex are set to 1 because summary 
tabindex is 1 too
-   $out->addHTML( $this->pagePage->getPageContainerEnd() );
+   $out->addHTML( $pageDisplayHandler->buildPageContainerEnd( 
$this->pagePage ) );
 
$out->addModules( 'ext.proofreadpage.page.edit' );
$out->addModuleStyles( [ 'ext.proofreadpage.base', 
'ext.proofreadpage.page' ] );
diff --git a/includes/page/PageDisplayHandler.php 
b/includes/page/PageDisplayHandler.php
new file mode 100644
index 000..b84cc14
--- /dev/null
+++ b/includes/page/PageDisplayHandler.php
@@ -0,0 +1,135 @@
+context = $context;
+   }
+
+   /**
+* Return the scan image width for display
+* @param ProofreadPagePage $page
+* @return int
+*/
+   public function getImageWidth( ProofreadPagePage $page ) {
+   $index = $page->getIndex();
+   if ( $index ) {
+   $width = $index->getIndexEntry( 'width' );
+   if ( $width !== null ) {
+   $width = $width->getStringValue();
+   if ( is_numeric( $width ) ) {
+   return $width;
+   }
+   }
+   }
+  

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Migrates links extraction to IndexContent

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370807 )

Change subject: Migrates links extraction to IndexContent
..

Migrates links extraction to IndexContent

Change-Id: I1cd83824b309708ccf6cdb2b396f0b2e985c20d9
---
M extension.json
A includes/Link.php
M includes/Pagination/PaginationFactory.php
M includes/Parser/PagesTagParser.php
M includes/index/EditIndexPage.php
M includes/index/IndexContent.php
M includes/index/IndexContentHandler.php
M includes/index/ProofreadIndexPage.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/index/ProofreadIndexPageTest.php
10 files changed, 256 insertions(+), 202 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/07/370807/1

diff --git a/extension.json b/extension.json
index bad3426..12f9ce6 100644
--- a/extension.json
+++ b/extension.json
@@ -46,6 +46,7 @@
"ProofreadPage\\DiffFormatterUtils": 
"includes/DiffFormatterUtils.php",
"ProofreadPage\\FileNotFoundException": 
"includes/FileNotFoundException.php",
"ProofreadPage\\FileProvider": "includes/FileProvider.php",
+   "ProofreadPage\\Link": "includes/Link.php",
"ProofreadIndexEntry": "includes/index/ProofreadIndexEntry.php",
"ProofreadIndexPage": "includes/index/ProofreadIndexPage.php",
"ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
diff --git a/includes/Link.php b/includes/Link.php
new file mode 100644
index 000..9c1d649
--- /dev/null
+++ b/includes/Link.php
@@ -0,0 +1,46 @@
+target = $target;
+   $this->label = $label;
+   }
+
+   /**
+* @return Title
+*/
+   public function getTarget() {
+   return $this->target;
+   }
+
+   /**
+* @return string
+*/
+   public function getLabel() {
+   return $this->label;
+   }
+}
diff --git a/includes/Pagination/PaginationFactory.php 
b/includes/Pagination/PaginationFactory.php
index 834723d..6e62a3e 100644
--- a/includes/Pagination/PaginationFactory.php
+++ b/includes/Pagination/PaginationFactory.php
@@ -52,7 +52,7 @@
}
 
// check if it is using pagelist
-   $pagelist = $indexPage->getPagelistTagContent();
+   $pagelist = $indexPage->getContent()->getPagelistTagContent();
if ( $pagelist !== null && $file && $file->isMultipage() ) {
return new FilePagination(
$indexPage,
@@ -61,12 +61,14 @@
$this->context
);
} else {
-   $links = $indexPage->getLinksToPageNamespace();
+   $links = $indexPage->getContent()->getLinksToNamespace(
+   
Context::getDefaultContext()->getPageNamespaceId()
+   );
$pages = [];
$pageNumbers = [];
foreach ( $links as $link ) {
-   $pages[] = new ProofreadPagePage( $link[0], 
$indexPage );
-   $pageNumbers[] = new PageNumber( $link[1] );
+   $pages[] = new ProofreadPagePage( 
$link->getTarget(), $indexPage );
+   $pageNumbers[] = new PageNumber( 
$link->getLabel() );
}
return new PagePagination( $indexPage, $pages, 
$pageNumbers );
}
diff --git a/includes/Parser/PagesTagParser.php 
b/includes/Parser/PagesTagParser.php
index 9d737b2..90cabe0 100644
--- a/includes/Parser/PagesTagParser.php
+++ b/includes/Parser/PagesTagParser.php
@@ -263,26 +263,28 @@
if ( $header == 'toc' ) {
$this->parser->getOutput()->is_toc = true;
}
-   $indexLinks = $indexPage->getLinksToMainNamespace();
+   $indexLinks = 
$indexPage->getContent()->getLinksToNamespace(
+   NS_MAIN, $indexTitle, true
+   );
$pageTitle = $this->parser->getTitle();
$h_out = '{{:MediaWiki:Proofreadpage_header_template';
$h_out .= "|value=$header";
// find next and previous pages in list
$indexLinksCount = count( $indexLinks );
for ( $i = 0; $i < $indexLinksCount; $i++ ) {
-   if ( $pageTitle->equals( $indexLinks[$i][0] ) ) 
{
-   $current = '[[' . 
$indexLinks[$i][0]->getFullText() . '|' .
-   $indexLinks[$i][1] . ']]';
+   if ( 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Improves style of Index: pages editing interface

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/362866 )

Change subject: Improves style of Index: pages editing interface
..

Improves style of Index: pages editing interface

Does some code cleanup too

Change-Id: Ib82bbf0759e34640b53a0f402100a6027b66ca87
---
M includes/index/EditIndexPage.php
M modules/index/ext.proofreadpage.index.css
D modules/index/images/help-question.gif
3 files changed, 10 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/66/362866/1

diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index cae1488..39221ca 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -94,13 +94,11 @@
] );
}
 
-   if ( !$entry->getHelp() ) {
-   $fieldLayoutArgs = [
-   'label' => $entry->getLabel()
-   ];
-   } else {
-   $fieldLayoutArgs = [
-   'label' => $entry->getLabel(),
+   $fieldLayoutArgs = [
+   'label' => $entry->getLabel()
+   ];
+   if ( $entry->getHelp() ) {
+   $fieldLayoutArgs += [
'help' => $entry->getHelp(),
'infusable' => true,
'classes' => [ 'prp-fieldLayout-help' ]
diff --git a/modules/index/ext.proofreadpage.index.css 
b/modules/index/ext.proofreadpage.index.css
index 99ff9f3..1bb21aa 100644
--- a/modules/index/ext.proofreadpage.index.css
+++ b/modules/index/ext.proofreadpage.index.css
@@ -1,3 +1,7 @@
 .prp-index-fieldLayout {
-   max-width: 750px;
+   max-width: 60em;
 }
+
+.prp-index-fieldLayout textarea {
+   resize: both;
+}
\ No newline at end of file
diff --git a/modules/index/images/help-question.gif 
b/modules/index/images/help-question.gif
deleted file mode 100644
index b4fc9c5..000
--- a/modules/index/images/help-question.gif
+++ /dev/null
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/362866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib82bbf0759e34640b53a0f402100a6027b66ca87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Adds Amrit Sreekumar to test pipeline

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361284 )

Change subject: Adds Amrit Sreekumar to test pipeline
..

Adds Amrit Sreekumar to test pipeline

Amrit is a GSoC student working on ProofreadPage: 
https://gerrit.wikimedia.org/r/#/q/amritsreekumar

Change-Id: Idd6a8000178338916c3ace6da8a24159104aa362
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/84/361284/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cc3bb20..682c234 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -57,6 +57,7 @@
 | agboreugene@gmail\.com
 | alexsh@mail2000\.com\.tw
 | amir\.aharoni@mail\.huji\.ac\.il
+| amrit\.sreekumar@gmail\.com
 | andreas\.burmeister@student\.hpi\.de
 | andrew\.green\.df@gmail\.com
 | anirudh24seven@gmail\.com
@@ -488,6 +489,8 @@
- ^xietaoecho@gmail\.com$ # Lethexie
- ^hbhyrava@gmail\.com$ # Darthbhyrava
- ^alangiderick@gmail\.com$ # D3r1ck01
+   - ^amrit\.sreekumar@gmail\.com$ # amritsreekumar
+
 
   # GCI students!
- ^bmp2558@gmail\.com$ # Georggi

-- 
To view, visit https://gerrit.wikimedia.org/r/361284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd6a8000178338916c3ace6da8a24159104aa362
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Preprocesses Wikitext before looking for the Index table of ...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361206 )

Change subject: Preprocesses Wikitext before looking for the Index table of 
content
..

Preprocesses Wikitext before looking for the Index table of content

Bug: T168768
Change-Id: Ia8074832cc9cffd0f2158d53888230b0c7574fce
---
M includes/index/ProofreadIndexPage.php
M tests/parser/proofreadpage_pages_pagelist.txt
2 files changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/06/361206/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index b82374e..a8c287e 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -285,7 +285,7 @@
 * @return array of array( Title title of the pointed page, the label 
of the link )
 */
public function getLinksToMainNamespace() {
-   return $this->getLinksToNamespaceFromContent( NS_MAIN );
+   return $this->getLinksToNamespaceFromContent( NS_MAIN, true );
}
 
/**
diff --git a/tests/parser/proofreadpage_pages_pagelist.txt 
b/tests/parser/proofreadpage_pages_pagelist.txt
index 6c2cbf3..98f7048 100644
--- a/tests/parser/proofreadpage_pages_pagelist.txt
+++ b/tests/parser/proofreadpage_pages_pagelist.txt
@@ -27,15 +27,22 @@
 !!endarticle
 
 !!article
+Index TOC
+!!text
+* [[Test/Chapter 2|Chapter 2]]
+* [[Test/Chapter 3|Chapter 3]]
+!!endarticle
+
+!!article
 Index:Test
 !!text
 {{:MediaWiki:Proofreadpage_index_template
 |Title=Title
 |Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] [[Page:Test 3.png|2]]
 |Author=[[Author:Me]]
-|TOC=* [[Test/Chapter 1]]
-* [[Test/Chapter 2|Chapter 2]]
-* [[Test/Chapter 3|Chapter 3]]
+|TOC=
+* [[Test/Chapter 1]]
+{{:Index TOC}}
 }}
 !!endarticle
 

-- 
To view, visit https://gerrit.wikimedia.org/r/361206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8074832cc9cffd0f2158d53888230b0c7574fce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses IndexContent to serialize index content on save

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359650 )

Change subject: Uses IndexContent to serialize index content on save
..

Uses IndexContent to serialize index content on save

Change-Id: I41df28dffcec09bc2f5487616e1aab6545c92c2c
---
M includes/index/EditIndexPage.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/50/359650/1

diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index 909b96f..2c25d86 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -9,6 +9,7 @@
 use ProofreadIndexEntry;
 use ProofreadIndexPage;
 use Status;
+use WikitextContent;
 use Xml;
 use XmlSelect;
 
@@ -128,17 +129,16 @@
}
 
$config = ProofreadIndexPage::getDataConfig();
-   $text = "{{:MediaWiki:Proofreadpage_index_template";
+   $fields = [];
foreach ( $config as $key => $params ) {
$field = $this->getFieldNameForEntry( $key );
$value = $this->cleanInputtedContent( 
$this->safeUnicodeInput( $request, $field ) );
$entry = new ProofreadIndexEntry( $key, $value, $params 
);
if ( !$entry->isHidden() ) {
-   $text .= "\n|" . $entry->getKey() . "=" . 
$entry->getStringValue();
+   $fields[$entry->getKey()] = new 
WikitextContent( $entry->getStringValue() );
}
}
-
-   return $text . "\n}}";
+   return ( new IndexContent( $fields ) )->serialize( 
$this->contentFormat );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/359650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41df28dffcec09bc2f5487616e1aab6545c92c2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: [WIP] Uses OOUI in Index pages editing interface

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359649 )

Change subject: [WIP] Uses OOUI in Index pages editing interface
..

[WIP] Uses OOUI in Index pages editing interface

Change-Id: I83fefb58aaa010a5826926fd0ec074227c53008e
---
M extension.json
M includes/index/EditIndexPage.php
D modules/index/ext.proofreadpage.index.css
M modules/index/ext.proofreadpage.index.js
D modules/index/images/help-question.gif
5 files changed, 53 insertions(+), 79 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/49/359649/1

diff --git a/extension.json b/extension.json
index ee75be8..93881ba 100644
--- a/extension.json
+++ b/extension.json
@@ -159,14 +159,6 @@
"ext.proofreadpage.base"
]
},
-   "ext.proofreadpage.index": {
-   "scripts": "index/ext.proofreadpage.index.js",
-   "styles": "index/ext.proofreadpage.index.css",
-   "dependencies": [
-   "ext.proofreadpage.base",
-   "jquery.tipsy"
-   ]
-   },
"ext.proofreadpage.special.indexpages": {
"styles": 
"special/indexpages/ext.proofreadpage.special.indexpages.css",
"dependencies": [
diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index 909b96f..7c507c3 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -4,13 +4,15 @@
 
 use ContentHandler;
 use EditPage;
-use Html;
-use OutputPage;
+use OOUI\ButtonWidget;
+use OOUI\DropdownInputWidget;
+use OOUI\FieldLayout;
+use OOUI\FieldsetLayout;
+use OOUI\HtmlSnippet;
+use OOUI\TextInputWidget;
 use ProofreadIndexEntry;
 use ProofreadIndexPage;
 use Status;
-use Xml;
-use XmlSelect;
 
 /**
  * @licence GNU GPL v2+
@@ -37,76 +39,72 @@
protected function showContentForm() {
$pageLang = $this->mTitle->getPageLanguage();
$out = $this->context->getOutput();
-   $inputAttributes = [ 'lang' => $pageLang->getCode(), 'dir' => 
$pageLang->getDir() ];
+   $out->enableOOUI();
+   $inputOptions = [ 'lang' => $pageLang->getCode(), 'dir' => 
$pageLang->getDir() ];
if ( wfReadOnly() ) {
-   $inputAttributes['readonly'] = '';
+   $inputOptions['readOnly'] = '';
}
 
-   $entries = $this->getActualContent()->getIndexEntries();
-
-   $out->addHTML( Html::openElement( 'table', [ 'id' => 
'prp-formTable' ] ) );
+   $fields = [];
$i = 10;
-   foreach ( $entries as $entry ) {
-   $inputAttributes['tabindex'] = $i;
-   $this->addEntry( $entry, $inputAttributes, $out );
+   /** @var ProofreadIndexEntry $entry */
+   foreach ( $this->getActualContent()->getIndexEntries() as 
$entry ) {
+   $inputOptions['tabIndex'] = $i;
+   if ( !$entry->isHidden() ) {
+   $fields[] = $this->buildEntry( $entry, 
$inputOptions );
+   }
$i++;
}
-   $out->addHTML( Html::closeElement( 'table' ) );
+
+   $out->addHTML( new FieldsetLayout( [
+   'items' => $fields
+   ] ) );
 
$out->addModules( 'ext.proofreadpage.index' );
}
 
-   /**
-* Add an entry to the form
-*
-* @param ProofreadIndexEntry $entry
-* @param array $inputAttributes
-*/
-   protected function addEntry( ProofreadIndexEntry $entry, 
$inputAttributes, OutputPage $out ) {
-   if ( $entry->isHidden() ) {
-   return;
-   }
+   private function buildEntry( ProofreadIndexEntry $entry, $inputOptions 
) {
$key = $this->getFieldNameForEntry( $entry->getKey() );
$val = $this->safeUnicodeOutput( $entry->getStringValue() );
 
-   $out->addHTML( Html::openElement( 'tr' ) . Html::openElement( 
'th', [ 'scope' => 'row' ] ) . Xml::label( $entry->getLabel(), $key ) );
-
-   $help = $entry->getHelp();
-   if ( $help !== '' ) {
-   $out->addHTML( Html::element( 'span', [ 'title' => 
$help, 'class' => 'prp-help-field' ] ) );
-   }
-
-   $out->addHTML( Html::closeElement( 'th' ) . Html::openElement( 
'td' ) );
+   $inputOptions['name'] = $key;
+   $inputOptions['value'] = $val;
+   $inputOptions['inputId'] = $key;
 
$values = $entry->getPossibleValues();
if ( $values !== null ) 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Restricts modules loaded by addModuleStyles() to styles only

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
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/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
4 files changed, 7 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/58/358158/1

diff --git a/extension.json b/extension.json
index 47afd82..7404cf2 100644
--- a/extension.json
+++ b/extension.json
@@ -115,11 +115,7 @@
},
"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",
@@ -129,7 +125,8 @@
"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/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: newchange
Gerrit-Change-Id: I3618015426edeb4e1378fa72bee4b4d4da53756a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Removes pagequality-admin right from sysop user group

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/358084 )

Change subject: Removes pagequality-admin right from sysop user group
..

Removes pagequality-admin right from sysop user group

Bug: T167491
Change-Id: I8fa665aae76f3beaaac15286ba0a15bc5996f587
---
M extension.json
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/84/358084/1

diff --git a/extension.json b/extension.json
index 47afd82..b547d79 100644
--- a/extension.json
+++ b/extension.json
@@ -15,9 +15,6 @@
"GroupPermissions": {
"user": {
"pagequality": true
-   },
-   "sysop": {
-   "pagequality-admin": true
}
},
"AvailableRights": [

-- 
To view, visit https://gerrit.wikimedia.org/r/358084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fa665aae76f3beaaac15286ba0a15bc5996f587
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Fixes OOjs-UI icon pack dependency

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357423 )

Change subject: Fixes OOjs-UI icon pack dependency
..

Fixes OOjs-UI icon pack dependency

Change-Id: Icc83a8f836fdb4f32a56217af6970ab9101cb112
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/23/357423/1

diff --git a/extension.json b/extension.json
index 6443ac8..10bf1b8 100644
--- a/extension.json
+++ b/extension.json
@@ -147,7 +147,7 @@
"vector": 
"page/ext.proofreadpage.page.navigation.vector.css"
},
"dependencies": [
-   "oojs-ui.styles.icons"
+   "oojs-ui.styles.icons-movement"
]
},
"ext.proofreadpage.article": {

-- 
To view, visit https://gerrit.wikimedia.org/r/357423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc83a8f836fdb4f32a56217af6970ab9101cb112
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Adds mw.wikibase.getEntityIdForTitle to Scribunto

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357126 )

Change subject: Adds mw.wikibase.getEntityIdForTitle to Scribunto
..

Adds mw.wikibase.getEntityIdForTitle to Scribunto

Allows to retrieve an item id from a page title

Simplified version of change I90699438062571887b95e05a7d13b6f295558418

Bug: T74815
Change-Id: I3ffec1f0a670f5a2e3ef072ad1a904f70149f240
---
M client/includes/DataAccess/Scribunto/mw.wikibase.lua
M client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
M docs/lua.wiki
3 files changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/26/357126/1

diff --git a/client/includes/DataAccess/Scribunto/mw.wikibase.lua 
b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
index 1577264..429e1a9 100644
--- a/client/includes/DataAccess/Scribunto/mw.wikibase.lua
+++ b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
@@ -143,6 +143,15 @@
return php.getEntityUrl( id )
end
 
+   -- Get the entity id for a given page on the current wiki.
+   --
+   -- @param {string} pageTitle
+   wikibase.getEntityIdForTitle = function( pageTitle )
+   checkType( 'getEntityIdForPage', 1, pageTitle, 'string' )
+   return php.getEntityId( pageTitle )
+   end
+
+
-- Get the label, label language for the given entity id, if specified,
-- or of the connected entity, if exists.
--
diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
 
b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
index bd90760..38ca775 100644
--- 
a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
+++ 
b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
@@ -97,6 +97,18 @@
  args = { 123 },
  expect = "bad argument #1 to 'getEntity' (string or nil expected, got 
number)"
},
+   { name = 'mw.wikibase.getEntityIdForTitle with existing title', func = 
mw.wikibase.getEntityIdForTitle,
+ args = { 'FooBarFoo' },
+ expect = { 'Q32487' }
+   },
+   { name = 'mw.wikibase.getEntityIdForTitle with non existing title', 
func = mw.wikibase.getEntityIdForTitle,
+ args = { 'Bar' },
+ expect = { nil }
+   },
+   { name = 'mw.wikibase.getEntityIdForTitle with invalid title', func = 
mw.wikibase.getEntityIdForTitle,
+   args = { 'a

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses IndexContent in ProofreadIndexPage

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355883 )

Change subject: Uses IndexContent in ProofreadIndexPage
..

Uses IndexContent in ProofreadIndexPage

Change-Id: I85b0aaa72fcf696c903f80c48701624c1e9ef305
---
M includes/index/EditIndexPage.php
M includes/index/ProofreadIndexPage.php
M includes/page/PageContentBuilder.php
M tests/phpunit/index/IndexContentHandlerTest.php
M tests/phpunit/index/ProofreadIndexPageTest.php
5 files changed, 89 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/83/355883/1

diff --git a/includes/index/EditIndexPage.php b/includes/index/EditIndexPage.php
index 819389e..909b96f 100644
--- a/includes/index/EditIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -2,6 +2,7 @@
 
 namespace ProofreadPage\Index;
 
+use ContentHandler;
 use EditPage;
 use Html;
 use OutputPage;
@@ -41,8 +42,7 @@
$inputAttributes['readonly'] = '';
}
 
-   $index = new ProofreadIndexPage( $this->mTitle, 
ProofreadIndexPage::getDataConfig(), $this->textbox1 );
-   $entries = $index->getIndexEntries();
+   $entries = $this->getActualContent()->getIndexEntries();
 
$out->addHTML( Html::openElement( 'table', [ 'id' => 
'prp-formTable' ] ) );
$i = 10;
@@ -178,7 +178,7 @@
 * @see EditPage::internalAttemptSave
 */
public function internalAttemptSave( &$result, $bot = false ) {
-   $index = new ProofreadIndexPage( $this->mTitle, 
ProofreadIndexPage::getDataConfig(), $this->textbox1 );
+   $index = $this->getActualContent();
 
// Get list of pages titles
$links = $index->getLinksToPageNamespace();
@@ -198,4 +198,12 @@
 
return parent::internalAttemptSave( $result, $bot );
}
+
+   private function getActualContent() {
+   return new ProofreadIndexPage(
+   $this->mTitle,
+   ProofreadIndexPage::getDataConfig(),
+   ContentHandler::getForModelID( $this->contentModel 
)->unserializeContent( $this->textbox1, $this->contentFormat )
+   );
+   }
 }
diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index e1543f6..b82374e 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -21,6 +21,7 @@
 
 use ProofreadPage\Context;
 use ProofreadPage\FileNotFoundException;
+use ProofreadPage\Index\IndexContent;
 use ProofreadPage\Pagination\PageList;
 
 /**
@@ -34,14 +35,9 @@
protected $title;
 
/**
-* @var string content of the page
+* @var IndexContent|null content of the page
 */
-   protected $text;
-
-   /**
-* @var ProofreadIndexEntry[] entries of the page
-*/
-   protected $entries;
+   protected $content;
 
/**
 * @var array configuration array
@@ -51,12 +47,12 @@
/**
 * @param Title $title Reference to a Title object.
 * @param array $config the configuration array (see 
ProofreadIndexPage::getDataConfig)
-* @param string $text content of the page. Warning: only done for 
EditProofreadIndexPage use.
+* @param IndexContent|null $content content of the page. Warning: only 
done for EditProofreadIndexPage use.
 */
-   public function __construct( Title $title, $config, $text = null ) {
+   public function __construct( Title $title, $config, IndexContent 
$content = null ) {
$this->title = $title;
$this->config = $config;
-   $this->text = $text;
+   $this->content = $content;
}
 
/**
@@ -65,7 +61,7 @@
 * @return ProofreadIndexPage
 */
public static function newFromTitle( Title $title ) {
-   return new self( $title, self::getDataConfig(), null );
+   return new self( $title, self::getDataConfig() );
}
 
/**
@@ -102,18 +98,23 @@
 
/**
 * Return content of the page
-* @return string
+* @return IndexContent
 */
-   protected function getText() {
-   if ( $this->text === null ) {
+   private function getContent() {
+   if ( $this->content === null ) {
$rev = Revision::newFromTitle( $this->title );
if ( $rev === null ) {
-   $this->text = '';
+   $this->content = new IndexContent( [] );
} else {
-   $this->text = ContentHandler::getContentText( 
$rev->getContent() );
+   $content = $rev->getContent();
+   if ( $content 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.30.0-wmf.2]: Properly handle batches of pages to update

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355534 )

Change subject: Properly handle batches of pages to update
..

Properly handle batches of pages to update

Using LIMIT on UPDATE/DELETE queries is unsafe when using statement-based
replication as you can't ensure the same sets of rows are updated.

Instead, select a batch of problematic page_ids, update by them, then
continue until we don't find any more to fix

Bug: T166261
Change-Id: I8a5d2989285c72450d6a48ccc12d88fdeeb3fb6f
---
M maintenance/fixProofreadIndexPagesContentModel.php
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/34/355534/1

diff --git a/maintenance/fixProofreadIndexPagesContentModel.php 
b/maintenance/fixProofreadIndexPagesContentModel.php
index afd3b6d..a73dd2b 100644
--- a/maintenance/fixProofreadIndexPagesContentModel.php
+++ b/maintenance/fixProofreadIndexPagesContentModel.php
@@ -50,9 +50,9 @@
$total = 0;
$namespaceId = ProofreadPage::getIndexNamespaceId();
do {
-   $dbw->update(
+   $pageIds = $dbw->selectFieldValues(
'page',
-   [ 'page_content_model' => 
CONTENT_MODEL_PROOFREAD_INDEX ],
+   'page_id',
[
'page_namespace' => $namespaceId,
'page_content_model' => 
CONTENT_MODEL_WIKITEXT
@@ -60,10 +60,19 @@
__METHOD__,
[ 'LIMIT' => $this->mBatchSize ]
);
+   if ( !$pageIds ) {
+   break;
+   }
+   $dbw->update(
+   'page',
+   [ 'page_content_model' => 
CONTENT_MODEL_PROOFREAD_INDEX ],
+   [ 'page_id' => $pageIds ],
+   __METHOD__
+   );
wfWaitForSlaves();
$total += $dbw->affectedRows();
$this->output( "$total\n" );
-   } while ( $dbw->affectedRows() > 0 );
+   } while ( true );
 
$this->output( "Update of the content model for Index: pages is 
done.\n" );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/355534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a5d2989285c72450d6a48ccc12d88fdeeb3fb6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.30.0-wmf.2
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Chad 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikidata...deploy[master]: Update mw2sparql endpoint URL

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355424 )

Change subject: Update mw2sparql endpoint URL
..

Update mw2sparql endpoint URL

Change-Id: Ifa684ce57dc51813a41bdee16308b669823d9c2d
---
M whitelist.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/deploy 
refs/changes/24/355424/1

diff --git a/whitelist.txt b/whitelist.txt
index f6b6cba..28a2858 100644
--- a/whitelist.txt
+++ b/whitelist.txt
@@ -15,4 +15,4 @@
 http://data.plan4all.eu/sparql
 http://vocab.getty.edu/sparql.json
 http://linkeddata.uriburner.com/sparql
-http://tools.wmflabs.org/mw2sparql/enwiki/sparql
+http://tools.wmflabs.org/mw2sparql/sparql

-- 
To view, visit https://gerrit.wikimedia.org/r/355424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa684ce57dc51813a41bdee16308b669823d9c2d
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/deploy
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Adds mw.wikibase.getItemIdForLink to Scribunto

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355230 )

Change subject: Adds mw.wikibase.getItemIdForLink to Scribunto
..

Adds mw.wikibase.getItemIdForLink to Scribunto

Allows to retrieve an item id from a page title and a site id

Bug: T74815
Change-Id: I90699438062571887b95e05a7d13b6f295558418
---
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
M client/includes/DataAccess/Scribunto/mw.wikibase.lua
M client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
M 
client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindingsTest.php
M docs/lua.wiki
6 files changed, 50 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/30/355230/1

diff --git 
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php 
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index 3e69e4a..0200f87 100644
--- a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -350,9 +350,10 @@
 *
 * @return array
 */
-   public function getEntityId( $pageTitle = null ) {
-   $this->checkType( 'getEntityByTitle', 1, $pageTitle, 'string' );
-   return array( 
$this->getLanguageIndependentLuaBindings()->getEntityId( $pageTitle ) );
+   public function getEntityId( $pageTitle = null, $globalSiteId = null ) {
+   $this->checkType( 'getEntityId', 1, $pageTitle, 'string' );
+   $this->checkType( 'getEntityId', 2, $globalSiteId, [ 'string', 
'NULL' ] );
+   return array( 
$this->getLanguageIndependentLuaBindings()->getEntityId( $pageTitle, 
$globalSiteId ) );
}
 
/**
diff --git 
a/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
 
b/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
index 5606142..eb92cab 100644
--- 
a/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
+++ 
b/client/includes/DataAccess/Scribunto/WikibaseLanguageIndependentLuaBindings.php
@@ -60,14 +60,18 @@
}
 
/**
-* Get entity id from page title.
+* Get entity id from page title and optionally site id
 *
 * @param string $pageTitle
+* @param string|null $globalSiteId
 *
 * @return string|null
 */
-   public function getEntityId( $pageTitle ) {
-   $id = $this->siteLinkLookup->getItemIdForLink( $this->siteId, 
$pageTitle );
+   public function getEntityId( $pageTitle, $globalSiteId = null ) {
+   if ( $globalSiteId === null ) {
+   $globalSiteId = $this->siteId;
+   }
+   $id = $this->siteLinkLookup->getItemIdForLink( $globalSiteId, 
$pageTitle );
 
if ( !$id ) {
return null;
diff --git a/client/includes/DataAccess/Scribunto/mw.wikibase.lua 
b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
index 1577264..0ec5afe 100644
--- a/client/includes/DataAccess/Scribunto/mw.wikibase.lua
+++ b/client/includes/DataAccess/Scribunto/mw.wikibase.lua
@@ -143,6 +143,17 @@
return php.getEntityUrl( id )
end
 
+   -- Get the entity id for a given page.
+--
+-- @param {string} [globalSiteId]
+-- @param {string} [pageTitle]
+wikibase.getItemIdForLink = function( globalSiteId, pageTitle )
+   checkTypeMulti( 'getItemIdForLink', 1, globalSiteId, { 'string', 'nil' 
} )
+   checkTypeMulti( 'getItemIdForLink', 2, pageTitle, { 'string' } )
+   return php.getEntityId( pageTitle, globalSiteId )
+end
+
+
-- Get the label, label language for the given entity id, if specified,
-- or of the connected entity, if exists.
--
diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
 
b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
index bd90760..c9f82a5 100644
--- 
a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
+++ 
b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
@@ -97,6 +97,22 @@
  args = { 123 },
  expect = "bad argument #1 to 'getEntity' (string or nil expected, got 
number)"
},
+   { name = 'mw.wikibase.getItemIdForLink (site id and title)', func = 
mw.wikibase.getItemIdForLink,
+  args = { 'fooSiteId', 'FooBarFoo' },
+  expect = { 'Q32487' }
+},
+{ name = 'mw.wikibase.getItemIdForLink (not existing site id and title)', 
func = mw.wikibase.getItemIdForLink,
+  args = { 'bar', 'FooBarFoo' },
+  expect = { 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Avoids CSS flicker when loading Page: pages editing interface

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/354531 )

Change subject: Avoids CSS flicker when loading Page: pages editing interface
..

Avoids CSS flicker when loading Page: pages editing interface

Change-Id: I65c469b1aa4a4ecbb0ba4199a0b3630e68eca8d0
---
M includes/page/EditPagePage.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/31/354531/1

diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index 4c97273..66e6ec8 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -116,6 +116,9 @@
$out->addHTML( $this->pagePage->getPageContainerEnd() );
 
$out->addModules( 'ext.proofreadpage.page.edit' );
+   $out->addModuleStyles( [
+   'ext.proofreadpage.page.edit', 
'ext.proofreadpage.page', 'ext.proofreadpage.base'
+   ] );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/354531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65c469b1aa4a4ecbb0ba4199a0b3630e68eca8d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Adds used file to dependencies

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/354519 )

Change subject: Adds used file to  dependencies
..

Adds used file to  dependencies

Bug: T97613
Change-Id: Id976d8a44fb185d5bd1cc2c310f686438e3b5a59
---
M includes/Parser/PagelistTagParser.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/19/354519/1

diff --git a/includes/Parser/PagelistTagParser.php 
b/includes/Parser/PagelistTagParser.php
index 03bb9bf..46fb505 100644
--- a/includes/Parser/PagelistTagParser.php
+++ b/includes/Parser/PagelistTagParser.php
@@ -84,6 +84,8 @@
}
}
 
+   $this->parser->getOutput()->addImage( 
$image->getTitle()->getDBkey(), $image->getTimestamp(), $image->getSha1() );
+
return trim( $this->parser->recursiveTagParse( $return ) );
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/354519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id976d8a44fb185d5bd1cc2c310f686438e3b5a59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Adds canadian aboriginal to mw.language.specialcharacters

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346062 )

Change subject: Adds canadian aboriginal to mw.language.specialcharacters
..

Adds canadian aboriginal to mw.language.specialcharacters

Bug: T108626
Change-Id: Ia337d42c6ef7f9645f1dd843ef0e7553857f6aa3
---
M resources/src/mediawiki.language/specialcharacters.json
1 file changed, 42 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/346062/1

diff --git a/resources/src/mediawiki.language/specialcharacters.json 
b/resources/src/mediawiki.language/specialcharacters.json
index 0dffd7d..c8b8a99 100644
--- a/resources/src/mediawiki.language/specialcharacters.json
+++ b/resources/src/mediawiki.language/specialcharacters.json
@@ -444,5 +444,47 @@
],
"khmer": [
"ក", "ខ", "គ", "ឃ", "ង", "ច", "ឆ", "ជ", "ឈ", "ញ", "ដ", "ឋ", 
"ឌ", "ឍ", "ណ", "ត", "ថ", "ទ", "ធ", "ន", "ប", "ផ", "ព", "ភ", "ម", "យ", "រ", "ល", 
"វ", "ស", "ហ", "ឡ", "អ", "ឣ", "ឤ", "ឥ", "ឦ", "ឧ", "ឨ", "ឩ", "ឪ", "ឫ", "ឬ", "ឭ", 
"ឮ", "ឯ", "ឰ", "ឱ", "ឲ", "ឳ", "្", "឴", "឵", "ា", "ិ", "ី", "ឹ", "ឺ", "ុ", "ូ", 
"ួ", "ើ", "ឿ", "ៀ", "េ", "ែ", "ៃ", "ោ", "ៅ", "ំ", "ះ", "ៈ", "៉", "៊", "់", "៌", 
"៍", "៎", "៏", "័", "៑", "៓", "៝", "ៜ", "០", "១", "២", "៣", "៤", "៥", "៦", "៧", 
"៨", "៩", "៛", "។", "៕", "៖", "ៗ", "៘", "៙", "៚", "៰", "៱", "៲", "៳", "៴", "៵", 
"៶", "៷", "៸", "៹", "᧠", "᧡", "᧢", "᧣", "᧤", "᧥", "᧦", "᧧", "᧨", "᧩", "᧪", "᧫", 
"᧬", "᧭", "᧮", "᧯", "᧰", "᧱", "᧲", "᧳", "᧴", "᧵", "᧶", "᧷", "᧸", "᧹", "᧺", "᧻", 
"᧼", "᧽", "᧾", "᧿"
+   ],
+   "canadian-aboriginal": [
+   "ᐁ", "ᐂ", "ᐃ", "ᐄ", "ᐅ", "ᐆ", "ᐇ", "ᐈ", "ᐉ", "ᐊ", "ᐋ", "ᐌ", 
"ᐍ", "ᐎ", "ᐏ", "ᐐ",
+   "ᐑ", "ᐒ", "ᐓ", "ᐔ", "ᐕ", "ᐖ", "ᐗ", "ᐘ", "ᐙ", "ᐚ", "ᐛ", "ᐜ", 
"ᐝ", "ᐞ", "ᐟ", "ᐠ",
+   "ᐡ", "ᐢ", "ᐣ", "ᐤ", "ᐥ", "ᐦ", "ᐧ", "ᐨ", "ᐩ", "ᐪ", "ᐫ", "ᐬ", 
"ᐭ", "ᐮ", "ᐯ", "ᐰ",
+   "ᐱ", "ᐲ", "ᐳ", "ᐴ", "ᐵ", "ᐶ", "ᐷ", "ᐸ", "ᐹ", "ᐺ", "ᐻ", "ᐼ", 
"ᐽ", "ᐾ", "ᐿ", "ᑀ",
+   "ᑁ", "ᑂ", "ᑃ", "ᑄ", "ᑅ", "ᑆ", "ᑇ", "ᑈ", "ᑉ", "ᑊ", "ᑋ", "ᑌ", 
"ᑍ", "ᑎ", "ᑏ", "ᑐ",
+   "ᑑ", "ᑒ", "ᑓ", "ᑔ", "ᑕ", "ᑖ", "ᑗ", "ᑘ", "ᑙ", "ᑚ", "ᑛ", "ᑜ", 
"ᑝ", "ᑞ", "ᑟ", "ᑠ",
+   "ᑡ", "ᑢ", "ᑣ", "ᑤ", "ᑥ", "ᑦ", "ᑧ", "ᑨ", "ᑩ", "ᑪ", "ᑫ", "ᑬ", 
"ᑭ", "ᑮ", "ᑯ", "ᑰ",
+   "ᑱ", "ᑲ", "ᑳ", "ᑴ", "ᑵ", "ᑶ", "ᑷ", "ᑸ", "ᑹ", "ᑺ", "ᑻ", "ᑼ", 
"ᑽ", "ᑾ", "ᑿ", "ᒀ",
+   "ᒁ", "ᒂ", "ᒃ", "ᒄ", "ᒅ", "ᒆ", "ᒇ", "ᒈ", "ᒉ", "ᒊ", "ᒋ", "ᒌ", 
"ᒍ", "ᒎ", "ᒏ", "ᒐ",
+   "ᒑ", "ᒒ", "ᒓ", "ᒔ", "ᒕ", "ᒖ", "ᒗ", "ᒘ", "ᒙ", "ᒚ", "ᒛ", "ᒜ", 
"ᒝ", "ᒞ", "ᒟ", "ᒠ",
+   "ᒡ", "ᒢ", "ᒣ", "ᒤ", "ᒥ", "ᒦ", "ᒧ", "ᒨ", "ᒩ", "ᒪ", "ᒫ", "ᒬ", 
"ᒭ", "ᒮ", "ᒯ", "ᒰ",
+   "ᒱ", "ᒲ", "ᒳ", "ᒴ", "ᒵ", "ᒶ", "ᒷ", "ᒸ", "ᒹ", "ᒺ", "ᒻ", "ᒼ", 
"ᒽ", "ᒾ", "ᒿ", "ᓀ",
+   "ᓁ", "ᓂ", "ᓃ", "ᓄ", "ᓅ", "ᓆ", "ᓇ", "ᓈ", "ᓉ", "ᓊ", "ᓋ", "ᓌ", 
"ᓍ", "ᓎ", "ᓏ", "ᓐ",
+   "ᓑ", "ᓒ", "ᓓ", "ᓔ", "ᓕ", "ᓖ", "ᓗ", "ᓘ", "ᓙ", "ᓚ", "ᓛ", "ᓜ", 
"ᓝ", "ᓞ", "ᓟ", "ᓠ",
+   "ᓡ", "ᓢ", "ᓣ", "ᓤ", "ᓥ", "ᓦ", "ᓧ", "ᓨ", "ᓩ", "ᓪ", "ᓫ", "ᓬ", 
"ᓭ", "ᓮ", "ᓯ", "ᓰ",
+   "ᓱ", "ᓲ", "ᓳ", "ᓴ", "ᓵ", "ᓶ", "ᓷ", "ᓸ", "ᓹ", "ᓺ", "ᓻ", "ᓼ", 
"ᓽ", "ᓾ", "ᓿ", "ᔀ",
+   "ᔁ", "ᔂ", "ᔃ", "ᔄ", "ᔅ", "ᔆ", "ᔇ", "ᔈ", "ᔉ", "ᔊ", "ᔋ", "ᔌ", 
"ᔍ", "ᔎ", "ᔏ", "ᔐ",
+   "ᔑ", "ᔒ", "ᔓ", "ᔔ", "ᔕ", "ᔖ", "ᔗ", "ᔘ", "ᔙ", "ᔚ", "ᔛ", "ᔜ", 
"ᔝ", "ᔞ", "ᔟ", "ᔠ",
+   "ᔡ", "ᔢ", "ᔣ", "ᔤ", "ᔥ", "ᔦ", "ᔧ", "ᔨ", "ᔩ", "ᔪ", "ᔫ", "ᔬ", 
"ᔭ", "ᔮ", "ᔯ", "ᔰ",
+   "ᔱ", "ᔲ", "ᔳ", "ᔴ", "ᔵ", "ᔶ", "ᔷ", "ᔸ", "ᔹ", "ᔺ", "ᔻ", "ᔼ", 
"ᔽ", "ᔾ", "ᔿ", "ᕀ",
+   "ᕁ", "ᕂ", "ᕃ", "ᕄ", "ᕅ", "ᕆ", "ᕇ", "ᕈ", "ᕉ", "ᕊ", "ᕋ", "ᕌ", 
"ᕍ", "ᕎ", "ᕏ", "ᕐ",
+   "ᕑ", "ᕒ", "ᕓ", "ᕔ", "ᕕ", "ᕖ", "ᕗ", "ᕘ", "ᕙ", "ᕚ", "ᕛ", "ᕜ", 
"ᕝ", "ᕞ", "ᕟ", "ᕠ",
+   "ᕡ", "ᕢ", "ᕣ", "ᕤ", "ᕥ", "ᕦ", "ᕧ", "ᕨ", "ᕩ", "ᕪ", "ᕫ", "ᕬ", 
"ᕭ", "ᕮ", "ᕯ", "ᕰ",
+   "ᕱ", "ᕲ", "ᕳ", "ᕴ", "ᕵ", "ᕶ", "ᕷ", "ᕸ", "ᕹ", "ᕺ", "ᕻ", "ᕼ", 
"ᕽ", "ᕾ", "ᕿ", "ᖀ",
+   "ᖁ", "ᖂ", "ᖃ", "ᖄ", "ᖅ", "ᖆ", "ᖇ", "ᖈ", "ᖉ", "ᖊ", "ᖋ", "ᖌ", 
"ᖍ", "ᖎ", "ᖏ", "ᖐ",
+   "ᖑ", "ᖒ", "ᖓ", "ᖔ", "ᖕ", "ᖖ", "ᖗ", "ᖘ", "ᖙ", "ᖚ", "ᖛ", "ᖜ", 
"ᖝ", "ᖞ", "ᖟ", "ᖠ",
+   "ᖡ", "ᖢ", "ᖣ", "ᖤ", "ᖥ", "ᖦ", "ᖧ", "ᖨ", "ᖩ", "ᖪ", "ᖫ", "ᖬ", 
"ᖭ", "ᖮ", "ᖯ", "ᖰ",
+   "ᖱ", "ᖲ", "ᖳ", "ᖴ", "ᖵ", "ᖶ", "ᖷ", "ᖸ", "ᖹ", "ᖺ", "ᖻ", "ᖼ", 
"ᖽ", "ᖾ", "ᖿ", "ᗀ",
+   "ᗁ", "ᗂ", "ᗃ", "ᗄ", "ᗅ", "ᗆ", "ᗇ", "ᗈ", "ᗉ", "ᗊ", "ᗋ", "ᗌ", 
"ᗍ", "ᗎ", "ᗏ", "ᗐ",
+   "ᗑ", "ᗒ", "ᗓ", "ᗔ", "ᗕ", "ᗖ", "ᗗ", "ᗘ", "ᗙ", "ᗚ", "ᗛ", "ᗜ", 
"ᗝ", "ᗞ", "ᗟ", "ᗠ",
+   "ᗡ", "ᗢ", "ᗣ", "ᗤ", "ᗥ", "ᗦ", "ᗧ", "ᗨ", "ᗩ", "ᗪ", "ᗫ", "ᗬ", 
"ᗭ", "ᗮ", "ᗯ", "ᗰ",
+   "ᗱ", "ᗲ", "ᗳ", "ᗴ", "ᗵ", "ᗶ", "ᗷ", "ᗸ", "ᗹ", "ᗺ", "ᗻ", "ᗼ", 
"ᗽ", "ᗾ", "ᗿ", "ᘀ",
+   "ᘁ", "ᘂ", "ᘃ", "ᘄ", "ᘅ", "ᘆ", "ᘇ", "ᘈ", "ᘉ", "ᘊ", "ᘋ", "ᘌ", 
"ᘍ", "ᘎ", "ᘏ", "ᘐ",
+   "ᘑ", "ᘒ", "ᘓ", "ᘔ", "ᘕ", "ᘖ", "ᘗ", "ᘘ", "ᘙ", "ᘚ", "ᘛ", "ᘜ", 
"ᘝ", "ᘞ", "ᘟ", "ᘠ",
+   "ᘡ", 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Drops OAI-PMH support

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346041 )

Change subject: Drops OAI-PMH support
..

Drops OAI-PMH support

Has nearly no usage

Change-Id: I8ad1a3ac4bda865e3580caf4a2e4bb37499e3a80
---
M extension.json
M includes/index/ProofreadIndexEntry.php
D includes/index/ProofreadIndexValue.php
D includes/index/oai/ProofreadIndexOaiError.php
D includes/index/oai/ProofreadIndexOaiRecord.php
D includes/index/oai/ProofreadIndexOaiSets.php
D includes/index/oai/SpecialProofreadIndexOai.php
D includes/index/oai/SpecialProofreadIndexOaiSchema.php
D includes/index/oai/schemas/qdc.xsd
9 files changed, 0 insertions(+), 1,994 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/41/346041/1

diff --git a/extension.json b/extension.json
index 33ca862..5598903 100644
--- a/extension.json
+++ b/extension.json
@@ -18,8 +18,6 @@
"pagequality"
],
"SpecialPages": {
-   "ProofreadIndexOai": "SpecialProofreadIndexOai",
-   "ProofreadIndexOaiSchema": "SpecialProofreadIndexOaiSchema",
"IndexPages": "ProofreadPages",
"PagesWithoutScans": "PagesWithoutScans"
},
@@ -46,18 +44,6 @@
"ProofreadPage\\FileProvider": "includes/FileProvider.php",
"EditProofreadIndexPage": 
"includes/index/EditProofreadIndexPage.php",
"ProofreadIndexEntry": "includes/index/ProofreadIndexEntry.php",
-   "ProofreadIndexValue": "includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueString": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueNumber": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValuePage": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueLangcode": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueIdentifier": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueIsbn": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueIssn": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueOclc": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueLccn": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueArc": 
"includes/index/ProofreadIndexValue.php",
-   "ProofreadIndexValueArk": 
"includes/index/ProofreadIndexValue.php",
"ProofreadIndexPage": "includes/index/ProofreadIndexPage.php",
"ProofreadIndexDbConnector": 
"includes/index/ProofreadIndexDbConnector.php",
"ProofreadPage\\Pagination\\PaginationFactory": 
"includes/Pagination/PaginationFactory.php",
@@ -83,11 +69,6 @@
"ProofreadPage\\Parser\\PagelistTagParser": 
"includes/Parser/PagelistTagParser.php",
"ProofreadPage\\Parser\\PagesTagParser": 
"includes/Parser/PagesTagParser.php",
"ProofreadPage\\Parser\\PagequalityTagParser": 
"includes/Parser/PagequalityTagParser.php",
-   "SpecialProofreadIndexOai": 
"includes/index/oai/SpecialProofreadIndexOai.php",
-   "ProofreadIndexOaiRecord": 
"includes/index/oai/ProofreadIndexOaiRecord.php",
-   "ProofreadIndexOaiSets": 
"includes/index/oai/ProofreadIndexOaiSets.php",
-   "ProofreadIndexOaiError": 
"includes/index/oai/ProofreadIndexOaiError.php",
-   "SpecialProofreadIndexOaiSchema": 
"includes/index/oai/SpecialProofreadIndexOaiSchema.php",
"ProofreadPages": "SpecialProofreadPages.php",
"PagesWithoutScans": "SpecialPagesWithoutScans.php",
"ApiQueryProofread": "ApiQueryProofread.php",
diff --git a/includes/index/ProofreadIndexEntry.php 
b/includes/index/ProofreadIndexEntry.php
index a6529d4..0dfb34b 100644
--- a/includes/index/ProofreadIndexEntry.php
+++ b/includes/index/ProofreadIndexEntry.php
@@ -119,35 +119,6 @@
}
 
/**
-* Return typed value. If the value doesn't match the value pattern a 
ProofreadIndexValueString is return.
-* @param string $value
-* @return ProofreadIndexValue
-*/
-   protected function getTypedValue( $value ) {
-   try {
-   $class = 
ProofreadIndexValue::getIndexValueClassNameForType( $this->getType() );
-   $val = new $class( $value, $this->config );
-   } catch ( MWException $e ) {
-   $class = 
ProofreadIndexValue::getIndexValueClassNameForType( 'string' );
-   $val = new $class( $value, $this->config );
-   }
-   return $val;
-   }
-
-   /**
-* Return the values of the entry as ProofreadIndexValue and splitted 
with the delimiter content
-* 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[wmf/1.29.0-wmf.18]: Makes sure to always return a Title in ProofreadPagePage::fi...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345423 )

Change subject: Makes sure to always return a Title in 
ProofreadPagePage::findIndexTitle
..

Makes sure to always return a Title in ProofreadPagePage::findIndexTitle

Change-Id: I82b2437c898cb32b27cf595e6dcf3b688013d38d
Task: T161734
---
M includes/page/ProofreadPagePage.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/23/345423/1

diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
index 9fa3a49..b1e464e 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -118,7 +118,7 @@
foreach ( $result as $x ) {
$refTitle = Title::makeTitle( $x->page_namespace, 
$x->page_title );
if ( $refTitle !== null && $refTitle->inNamespace( 
ProofreadPage::getIndexNamespaceId() ) ) {
-   if ( $refTitle->equals( $possibleIndexTitle ) ) 
{ // It is the same as the linked file, we know it's this Index:
+   if ( $possibleIndexTitle !== null && 
$refTitle->equals( $possibleIndexTitle ) ) { // It is the same as the linked 
file, we know it's this Index:
return $refTitle;
}
$indexesThatLinksHere[] = $refTitle;
@@ -126,8 +126,7 @@
}
if ( !empty( $indexesThatLinksHere ) ) {
// TODO: what should we do if there are more than 1 
possible index?
-   $this->index = ProofreadIndexPage::newFromTitle( 
$indexesThatLinksHere[0] );
-   return $this->index;
+   return reset( $indexesThatLinksHere );
}
 
return $possibleIndexTitle;

-- 
To view, visit https://gerrit.wikimedia.org/r/345423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82b2437c898cb32b27cf595e6dcf3b688013d38d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: wmf/1.29.0-wmf.18
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes sure to always return a Title in ProofreadPagePage::fi...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345421 )

Change subject: Makes sure to always return a Title in 
ProofreadPagePage::findIndexTitle
..

Makes sure to always return a Title in ProofreadPagePage::findIndexTitle

Change-Id: I82b2437c898cb32b27cf595e6dcf3b688013d38d
Task: T161734
---
M includes/page/ProofreadPagePage.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/21/345421/1

diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
index 9fa3a49..b1e464e 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -118,7 +118,7 @@
foreach ( $result as $x ) {
$refTitle = Title::makeTitle( $x->page_namespace, 
$x->page_title );
if ( $refTitle !== null && $refTitle->inNamespace( 
ProofreadPage::getIndexNamespaceId() ) ) {
-   if ( $refTitle->equals( $possibleIndexTitle ) ) 
{ // It is the same as the linked file, we know it's this Index:
+   if ( $possibleIndexTitle !== null && 
$refTitle->equals( $possibleIndexTitle ) ) { // It is the same as the linked 
file, we know it's this Index:
return $refTitle;
}
$indexesThatLinksHere[] = $refTitle;
@@ -126,8 +126,7 @@
}
if ( !empty( $indexesThatLinksHere ) ) {
// TODO: what should we do if there are more than 1 
possible index?
-   $this->index = ProofreadIndexPage::newFromTitle( 
$indexesThatLinksHere[0] );
-   return $this->index;
+   return reset( $indexesThatLinksHere );
}
 
return $possibleIndexTitle;

-- 
To view, visit https://gerrit.wikimedia.org/r/345421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82b2437c898cb32b27cf595e6dcf3b688013d38d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Fixes PageLevelTest

[Tpt (Code Review)]

Tpt has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335441 )

Change subject: Fixes PageLevelTest
..


Fixes PageLevelTest

It's not possible anymore to add group to users not saved in the database

Change-Id: Ibe664a87b3fcf7d7ee2eb146af0420ffa895ff2d
---
M tests/phpunit/page/PageLevelTest.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Tpt: Verified; Looks good to me, approved



diff --git a/tests/phpunit/page/PageLevelTest.php 
b/tests/phpunit/page/PageLevelTest.php
index 1cad193..a32a151 100644
--- a/tests/phpunit/page/PageLevelTest.php
+++ b/tests/phpunit/page/PageLevelTest.php
@@ -9,7 +9,7 @@
  * @group ProofreadPage
  * @covers ProofreadPageLevel
  */
-class ProofreadPageLevelTest extends ProofreadPageTestCase {
+class PageLevelTest extends ProofreadPageTestCase {
 
public function setUp() {
parent::setUp();
@@ -47,8 +47,10 @@
 
public function isChangeAllowedProvider() {
$testUser = User::newFromName( 'Test' );
+   $testUser->addToDatabase();
$testUser->addGroup( 'user' );
$test2User =  User::newFromName( 'Test2' );
+   $test2User->addToDatabase();
$test2User->addGroup( 'user' );
$ipUser = User::newFromName( '172.16.254.7', false );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/335441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe664a87b3fcf7d7ee2eb146af0420ffa895ff2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Fixes PageLevelTest

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/335441 )

Change subject: Fixes PageLevelTest
..

Fixes PageLevelTest

It's not possible anymore to add group to users not saved in the database

Change-Id: Ibe664a87b3fcf7d7ee2eb146af0420ffa895ff2d
---
M tests/phpunit/page/PageLevelTest.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/41/335441/1

diff --git a/tests/phpunit/page/PageLevelTest.php 
b/tests/phpunit/page/PageLevelTest.php
index 1cad193..a32a151 100644
--- a/tests/phpunit/page/PageLevelTest.php
+++ b/tests/phpunit/page/PageLevelTest.php
@@ -9,7 +9,7 @@
  * @group ProofreadPage
  * @covers ProofreadPageLevel
  */
-class ProofreadPageLevelTest extends ProofreadPageTestCase {
+class PageLevelTest extends ProofreadPageTestCase {
 
public function setUp() {
parent::setUp();
@@ -47,8 +47,10 @@
 
public function isChangeAllowedProvider() {
$testUser = User::newFromName( 'Test' );
+   $testUser->addToDatabase();
$testUser->addGroup( 'user' );
$test2User =  User::newFromName( 'Test2' );
+   $test2User->addToDatabase();
$test2User->addGroup( 'user' );
$ipUser = User::newFromName( '172.16.254.7', false );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/335441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe664a87b3fcf7d7ee2eb146af0420ffa895ff2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses the Index: page based on file name when there are multi...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/335439 )

Change subject: Uses the Index: page based on file name when there are multiple 
possible Index: pages
..

Uses the Index: page based on file name when there are multiple possible Index: 
pages

When more than one Index: page links to a Page: page we should use as Index: 
for this page the Index: pages that shares the same file name, if it exists.

E.g. if Index:Foo and Index:Bar.djvu both link to Page:Bar.djvu/3, we should 
use as index Index:Bar.djvu.

Change-Id: I738fe279933b4110cb31d0a3616aa4c52341c48a
---
M includes/page/ProofreadPagePage.php
1 file changed, 33 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/39/335439/1

diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
index 1d4ad82..9fa3a49 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -99,16 +99,44 @@
return $this->index;
}
 
-   $result = ProofreadIndexDbConnector::getRowsFromTitle( 
$this->title );
+   $indexTitle = $this->findIndexTitle();
+   if ( $indexTitle === null ) {
+   $this->index = false;
+   return false;
+   } else {
+   $this->index = ProofreadIndexPage::newFromTitle( 
$indexTitle );
+   return $this->index;
+   }
+   }
 
+   private function findIndexTitle() {
+   $possibleIndexTitle = 
$this->findPossibleIndexTitleBasedOnName();
+
+   // Try to find links from Index: pages
+   $result = ProofreadIndexDbConnector::getRowsFromTitle( 
$this->title );
+   $indexesThatLinksHere = [];
foreach ( $result as $x ) {
$refTitle = Title::makeTitle( $x->page_namespace, 
$x->page_title );
if ( $refTitle !== null && $refTitle->inNamespace( 
ProofreadPage::getIndexNamespaceId() ) ) {
-   $this->index = 
ProofreadIndexPage::newFromTitle( $refTitle );
-   return $this->index;
+   if ( $refTitle->equals( $possibleIndexTitle ) ) 
{ // It is the same as the linked file, we know it's this Index:
+   return $refTitle;
+   }
+   $indexesThatLinksHere[] = $refTitle;
}
}
+   if ( !empty( $indexesThatLinksHere ) ) {
+   // TODO: what should we do if there are more than 1 
possible index?
+   $this->index = ProofreadIndexPage::newFromTitle( 
$indexesThatLinksHere[0] );
+   return $this->index;
+   }
 
+   return $possibleIndexTitle;
+   }
+
+   /**
+* @return Title|null the index page based on the name of the Page: 
page and the existence of a file with the same name
+*/
+   private function findPossibleIndexTitleBasedOnName() {
$m = explode( '/', $this->title->getText(), 2 );
if ( isset( $m[1] ) ) {
$imageTitle = Title::makeTitleSafe( NS_FILE, $m[0] );
@@ -116,16 +144,11 @@
$image = wfFindFile( $imageTitle );
// if it is multipage, we use the page order of 
the file
if ( $image && $image->exists() && 
$image->isMultipage() ) {
-   $indexTitle = Title::makeTitle( 
ProofreadPage::getIndexNamespaceId(), $image->getTitle()->getText() );
-   if ( $indexTitle !== null ) {
-   $this->index = 
ProofreadIndexPage::newFromTitle( $indexTitle );
-   return $this->index;
-   }
+   return Title::makeTitle( 
ProofreadPage::getIndexNamespaceId(), $image->getTitle()->getText() );
}
}
}
-   $this->index = false;
-   return false;
+   return null;
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/335439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I738fe279933b4110cb31d0a3616aa4c52341c48a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: EditFilterMergedContent hook should not fail if the previous...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332551 )

Change subject: EditFilterMergedContent hook should not fail if the previous 
content has a different model
..

EditFilterMergedContent hook should not fail if the previous content has a 
different model

Bug: T155360
Change-Id: Ib061e4bb52f9fe070f51f98e14c1bab7dfab4caf
---
M ProofreadPage.body.php
1 file changed, 20 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/51/332551/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index a29dd54..3d1254f 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -20,9 +20,9 @@
  */
 
 use ProofreadPage\Context;
+use ProofreadPage\FileNotFoundException;
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
-use ProofreadPage\FileNotFoundException;
 use ProofreadPage\Pagination\PageNotInPaginationException;
 
 /*
@@ -589,30 +589,39 @@
/**
 * Make validation of the content in the edit API
 *
-* @param $context Object implementing the IContextSource interface.
+* @param $context IContextSource implementing the IContextSource 
interface.
 * @param $content Content of the edit box, as a Content object.
 * @param $status  Status object to represent errors, etc.
-* @param $summary Edit summary for page
-* @param $user  The User object representing the user whois performing 
the edit.
-* @param $minoredit  Whether the edit was marked as minor by the user.
+* @param $summary string Edit summary for page
+* @param $user User The User object representing the user whois 
performing the edit.
+* @param $minoredit boolean Whether the edit was marked as minor by 
the user.
 * @return bool
 */
public static function onEditFilterMergedContent( IContextSource 
$context, Content $content,
Status $status, $summary, User $user, $minoredit ) {
 
// If the content's model isn't ours, ignore this; there's 
nothing for us to do here.
-   if ( ! ( $content instanceof PageContent ) ) {
+   if ( !( $content instanceof PageContent ) ) {
return true;
+   }
+
+   // Fail if the content is invalid, or the level is being 
removed.
+   if ( !$content->isValid() ) {
+   $status->fatal( 'proofreadpage_badpagetext' );
+   return false;
}
 
$oldContent = $context->getWikiPage()->getContent( 
Revision::FOR_THIS_USER, $user );
if ( $oldContent === null ) {
$oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )->makeEmptyContent();
}
-
-   // Fail if the content is invalid, or the level is being 
removed.
-   if ( !$content->isValid() ) {
-   $ourStatus = Status::newFatal( 
'proofreadpage_badpagetext' );
+   if ( $oldContent->getModel() !== CONTENT_MODEL_PROOFREAD_PAGE ) 
{
+   // Let's convert it to Page: page content
+   $oldContent = $oldContent->convert( 
CONTENT_MODEL_PROOFREAD_PAGE );
+   }
+   if ( !( $oldContent instanceof PageContent ) ) {
+   // We consider it as a page creation
+   $oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )->makeEmptyContent();
}
 
$oldLevel = $oldContent->getLevel();
@@ -620,12 +629,7 @@
 
// Fail if the user changed the level and the change isn't 
allowed
if ( !$oldLevel->isChangeAllowed( $newLevel ) ) {
-   $ourStatus = Status::newFatal( 
'proofreadpage_notallowedtext' );
-   }
-
-   if ( isset( $ourStatus ) ) {
-   $ourStatus->value = EditPage::AS_HOOK_ERROR;
-   $status->merge( $ourStatus );
+   $status->fatal( 'proofreadpage_notallowedtext' );
return false;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/332551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib061e4bb52f9fe070f51f98e14c1bab7dfab4caf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] ProofreadPage extension

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331799 )

Change subject: [WIP] ProofreadPage extension
..

[WIP] ProofreadPage extension

Change-Id: Ibdf8a6e0390bf79e9aeb67a0beaa9ad0c9705e90
---
A lib/ext/PRP/index.js
1 file changed, 74 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/99/331799/1

diff --git a/lib/ext/PRP/index.js b/lib/ext/PRP/index.js
new file mode 100644
index 000..1072e80
--- /dev/null
+++ b/lib/ext/PRP/index.js
@@ -0,0 +1,74 @@
+/* --
+ * This is an implementation of
+ * -- */
+'use strict';
+
+var ParsoidExtApi = 
module.parent.require('./extapi.js').versionCheck('^0.6.1');
+var DU = ParsoidExtApi.DOMUtils;
+var Promise = ParsoidExtApi.Promise;
+var addMetaData = ParsoidExtApi.addMetaData;
+
+/**
+ * Native Parsoid implementation of the "json" contentmodel.
+ */
+var PRPExt = function() {
+this.config = {
+contentmodels: {
+'proofread-page': this
+}
+};
+};
+
+var parsePageWikitext = function( text ) {
+var structureMatchResult, headerMatchResult, result = {
+header: '',
+body: '',
+footer: '',
+level: {
+level: 1,
+user: null
+}
+};
+
+structureMatchResult = wikitext.match( 
/^([\s\S]*)\n*<\/noinclude>([\s\S]*)([\s\S]*)<\/noinclude>$/
 );
+if ( structureMatchResult === null ) {
+result.body = wikitext;
+return result;
+}
+result.body = structureMatchResult[ 2 ];
+result.footer = structureMatchResult[ 3 ];
+
+headerMatchResult = structureMatchResult[ 1 ].match( /^|> *<\/pagequality>)([\s\S]*)$/ );
+if ( headerMatchResult === null ) {
+result.header = structureMatchResult[ 1 ];
+return result;
+}
+result.level.level = parseInt( headerMatchResult[ 1 ] );
+result.level.user = headerMatchResult[ 2 ];
+result.header = headerMatchResult[ 4 ];
+return result;
+};
+
+// Wikitext to HTML
+PRPExt.prototype.toHTML = Promise.method(function(env) {
+// Default: wikitext parser.
+   var content = parsePageWikitext(env.page.src);
+   var serialization =
+'' +
+'' +
+content.header +
+'' +
+'' + content.body + '' +
+'' + content.footer + '';
+   return env.pipelineFactory.parse(serialization);
+});
+
+// HTML to Wikitext
+PRPExt.prototype.fromHTML = Promise.method(function(env, body, useSelser) {
+// Default: wikitext serializer.
+return DU.serializeDOM(env, body, useSelser);
+});
+
+if (typeof module === "object") {
+module.exports = PRPExt;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/331799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdf8a6e0390bf79e9aeb67a0beaa9ad0c9705e90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Do not use Parser inner attributes

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331676 )

Change subject: Do not use Parser inner attributes
..

Do not use Parser inner attributes

Change-Id: Ib82868e26365e9fe64403f72b7450fe187fb
---
M includes/index/ProofreadIndexPage.php
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/76/331676/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index e73716b..ca5800a 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -249,12 +249,14 @@
$dom = $dom->getFirstChild();
$childframe = $frame->newChild( 
$dom->getChildrenOfType( 'part' ) );
 
+   $stripState = new StripState();
+   $namedArgs = $childframe->getNamedArguments();
foreach ( $this->config as $varName => $property ) {
-   if ( !array_key_exists( $varName, 
$childframe->namedArgs ) ) {
+   if ( !array_key_exists( $varName, $namedArgs ) 
) {
continue;
}
-   $values[$varName] = 
$parser->mStripState->unstripBoth( 
$parser->getPreprocessor()->newFrame()->expand(
-   $childframe->namedArgs[$varName], 
PPFrame::RECOVER_ORIG
+   $values[$varName] = $stripState->unstripBoth( 
$parser->getPreprocessor()->newFrame()->expand(
+   $namedArgs[$varName], 
PPFrame::RECOVER_ORIG
) );
}
$this->entries = 
$this->getIndexEntriesFromIndexContent( $values );

-- 
To view, visit https://gerrit.wikimedia.org/r/331676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib82868e26365e9fe64403f72b7450fe187fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Use custom actions for editing Index: pages

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331416 )

Change subject: Use custom actions for editing Index: pages
..

Use custom actions for editing Index: pages

Change-Id: I96bfbf31e17da95e874bb036a211b7b866c1c7a3
---
M ProofreadPage.body.php
M extension.json
R includes/index/EditIndexPage.php
M includes/index/IndexContentHandler.php
A includes/index/IndexEditAction.php
A includes/index/IndexSubmitAction.php
6 files changed, 92 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/16/331416/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 904ffe6..6a390fc 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -20,9 +20,10 @@
  */
 
 use ProofreadPage\Context;
+use ProofreadPage\FileNotFoundException;
+use ProofreadPage\Index\EditIndexPage;
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
-use ProofreadPage\FileNotFoundException;
 use ProofreadPage\Pagination\PageNotInPaginationException;
 
 /*
@@ -93,23 +94,6 @@
return false;
} elseif ( $title->inNamespace( self::getIndexNamespaceId() ) ) 
{
$model = CONTENT_MODEL_PROOFREAD_INDEX;
-   return false;
-   } else {
-   return true;
-   }
-   }
-
-   /**
-* Set up our custom edition system.
-*
-* @param Article $article  being edited
-* @param User $user User performing the edit
-* @return boolean hook return value
-*/
-   public static function onCustomEditor( Article $article, User $user ) {
-   if ( $article->getTitle()->inNamespace( 
self::getIndexNamespaceId() ) ) { // TODO ExternalEditor case
-   $editor = new EditProofreadIndexPage( $article );
-   $editor->edit();
return false;
} else {
return true;
diff --git a/extension.json b/extension.json
index c16616f..e3ed6b4 100644
--- a/extension.json
+++ b/extension.json
@@ -44,7 +44,6 @@
"ProofreadPage\\DiffFormatterUtils": 
"includes/DiffFormatterUtils.php",
"ProofreadPage\\FileNotFoundException": 
"includes/FileNotFoundException.php",
"ProofreadPage\\FileProvider": "includes/FileProvider.php",
-   "EditProofreadIndexPage": 
"includes/index/EditProofreadIndexPage.php",
"ProofreadIndexEntry": "includes/index/ProofreadIndexEntry.php",
"ProofreadIndexValue": "includes/index/ProofreadIndexValue.php",
"ProofreadIndexValueString": 
"includes/index/ProofreadIndexValue.php",
@@ -62,6 +61,9 @@
"ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
"ProofreadPage\\Index\\IndexRedirectContent": 
"includes/index/IndexRedirectContent.php",
"ProofreadPage\\Index\\IndexContentHandler": 
"includes/index/IndexContentHandler.php",
+   "ProofreadPage\\Index\\IndexEditAction": 
"includes/index/IndexEditAction.php",
+   "ProofreadPage\\Index\\IndexSubmitAction": 
"includes/index/IndexSubmitAction.php",
+   "ProofreadPage\\Index\\EditIndexPage": 
"includes/index/EditIndexPage.php",
"ProofreadIndexDbConnector": 
"includes/index/ProofreadIndexDbConnector.php",
"ProofreadPage\\Pagination\\PaginationFactory": 
"includes/Pagination/PaginationFactory.php",
"ProofreadPage\\Pagination\\PageNumber": 
"includes/Pagination/PageNumber.php",
@@ -293,9 +295,6 @@
],
"GetPreferences": [
"ProofreadPage::onGetPreferences"
-   ],
-   "CustomEditor": [
-   "ProofreadPage::onCustomEditor"
],
"CanonicalNamespaces": [
"ProofreadPage::addCanonicalNamespaces"
diff --git a/includes/index/EditProofreadIndexPage.php 
b/includes/index/EditIndexPage.php
similarity index 76%
rename from includes/index/EditProofreadIndexPage.php
rename to includes/index/EditIndexPage.php
index 38d9707..819389e 100644
--- a/includes/index/EditProofreadIndexPage.php
+++ b/includes/index/EditIndexPage.php
@@ -1,33 +1,37 @@
 http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup ProofreadPage
+ * @licence GNU GPL v2+
  */
+class EditIndexPage extends EditPage {
 
-class EditProofreadIndexPage extends EditPage {
-
+   /**
+* @see EditPage::isSectionEditSupported
+*/
protected function isSectionEditSupported() {
return false; // sections and forms don't mix
}
 
/**
-* Add custom fields
+* @see EditPage::isSupportedContentModel
+*/
+   public 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Sets Mediawiki:Proofreadpage_index_data_config content model...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331413 )

Change subject: Sets Mediawiki:Proofreadpage_index_data_config content model to 
JSON
..

Sets Mediawiki:Proofreadpage_index_data_config content model to JSON

Change-Id: Ic4b4068a9c62a7c1fe5aa8da74ffe97b33272984
---
M ProofreadPage.body.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/13/331413/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 904ffe6..97a3047 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -20,9 +20,9 @@
  */
 
 use ProofreadPage\Context;
+use ProofreadPage\FileNotFoundException;
 use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
-use ProofreadPage\FileNotFoundException;
 use ProofreadPage\Pagination\PageNotInPaginationException;
 
 /*
@@ -93,6 +93,9 @@
return false;
} elseif ( $title->inNamespace( self::getIndexNamespaceId() ) ) 
{
$model = CONTENT_MODEL_PROOFREAD_INDEX;
+   return false;
+   } elseif ( $title->equals( Title::makeTitle( NS_MEDIAWIKI, 
'Proofreadpage index data config' ) ) ) {
+   $model = CONTENT_MODEL_JSON;
return false;
} else {
return true;
@@ -704,7 +707,6 @@
// fix issue with content type hardcoded in database
if ( isset( $wgContentHandlerUseDB ) && $wgContentHandlerUseDB 
) {
$updater->addPostDatabaseUpdateMaintenance( 
'FixProofreadPagePagesContentModel' );
-   $updater->addPostDatabaseUpdateMaintenance( 
'FixProofreadIndexPagesContentModel' );
}
 
return true;
@@ -880,8 +882,6 @@
 
// Content handler
define( 'CONTENT_MODEL_PROOFREAD_PAGE', 'proofread-page' );
-   define( 'CONTENT_MODEL_PROOFREAD_INDEX', 'proofread-index' );
$wgContentHandlers[CONTENT_MODEL_PROOFREAD_PAGE] = 
'\ProofreadPage\Page\PageContentHandler';
-   $wgContentHandlers[CONTENT_MODEL_PROOFREAD_INDEX] = 
'\ProofreadPage\Index\IndexContentHandler';
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/331413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4b4068a9c62a7c1fe5aa8da74ffe97b33272984
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Fixes ProofreadPage parser tests

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329059 )

Change subject: Fixes ProofreadPage parser tests
..

Fixes ProofreadPage parser tests

No idea of why the previous code behaved wrongly. I need to learn more about 
PHP objects behaviours.

Bug: T145724
Change-Id: I9f197aa0b8ff4a97258826cce621887f24c21e1d
---
M includes/Context.php
M tests/parser/proofreadpage_pages_pagelist.txt
D tests/parser/proofreadpage_pages_pagelist_ignored.txt
3 files changed, 194 insertions(+), 190 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/59/329059/1

diff --git a/includes/Context.php b/includes/Context.php
index 20bb074..d52141d 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -31,11 +31,6 @@
private $fileProvider;
 
/**
-* @var PaginationFactory
-*/
-   private $paginationFactory;
-
-   /**
 * @param int $pageNamespaceId
 * @param int $indexNamespaceId
 * @param FileProvider $fileProvider
@@ -44,7 +39,6 @@
$this->pageNamespaceId = $pageNamespaceId;
$this->indexNamespaceId = $indexNamespaceId;
$this->fileProvider = $fileProvider;
-   $this->paginationFactory = new PaginationFactory( $this );
}
 
/**
@@ -72,7 +66,7 @@
 * @return PaginationFactory
 */
public function getPaginationFactory() {
-   return $this->paginationFactory;
+   return new PaginationFactory( $this );
}
 
/**
diff --git a/tests/parser/proofreadpage_pages_pagelist.txt 
b/tests/parser/proofreadpage_pages_pagelist.txt
index 0a008fc..6c2cbf3 100644
--- a/tests/parser/proofreadpage_pages_pagelist.txt
+++ b/tests/parser/proofreadpage_pages_pagelist.txt
@@ -4,6 +4,15 @@
 !! endhooks
 
 !!article
+MediaWiki:Proofreadpage index template
+!!text
+Title: {{{Title}}}
+Author: {{{Author}}}
+Pages: {{{Pages}}}
+TOC: {{{TOC}}}
+!!endarticle
+
+!!article
 MediaWiki:Proofreadpage pagenum template
 !!text
 [[{{{page}}}|{{{num}}}]]
@@ -20,7 +29,7 @@
 !!article
 Index:Test
 !!text
-{{
+{{:MediaWiki:Proofreadpage_index_template
 |Title=Title
 |Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] [[Page:Test 3.png|2]]
 |Author=[[Author:Me]]
@@ -33,7 +42,7 @@
 !!article
 Index:LoremIpsum.djvu
 !!text
-{{
+{{:MediaWiki:Proofreadpage_index_template
 |Title=Lorem Ipsum
 |Pages= 
 |Author=[[Author:Me]]
@@ -238,7 +247,7 @@
 !!article
 Index:TestSection
 !!text
-{{
+{{:MediaWiki:Proofreadpage_index_template
 |Pages=[[Page:TestSection 1|TOC]] [[Page:TestSection 2|1]] [[Page:TestSection 
3|2]]
 }}
 !!endarticle
@@ -486,3 +495,184 @@
 ૧ 
૨
 
 !! end
+
+!! test
+pages: with file: Simple transclusion
+!! options
+djvu
+!! wikitext
+
+!! html
+
+2Page 43Page:LoremIpsum.djvu/5
+
+
+
+!! end
+
+!! test
+pages: with file: Simple transclusion without from
+!! options
+djvu
+!! wikitext
+
+!! html
+
+iPage 1II
+Page 2
+
+
+
+!! end
+
+!! test
+pages: with file: Invalid from
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: Invalid to
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: Invalid range
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: Invalid include
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: Simple transclusion without to
+!! options
+djvu
+!! wikitext
+
+!! html
+
+2Page 43Page:LoremIpsum.djvu/5
+
+
+
+!! end
+
+!! test
+pages: with file: step
+!! options
+djvu
+!! wikitext
+
+!! html
+
+1Page 33Page:LoremIpsum.djvu/5
+
+
+
+!! end
+
+!! test
+pages: with file: Invalid step
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Numeric value expected
+
+!! end
+
+!! test
+pages: with file: exclude
+!! options
+djvu
+!! wikitext
+
+!! html
+
+1Page 33Page:LoremIpsum.djvu/5
+
+
+
+!! end
+
+!! test
+pages: with file: include
+!! options
+djvu
+!! wikitext
+
+!! html
+
+iPage 1II
+Page 22Page 4
+
+
+
+!! end
+
+!! test
+pages: with file: invalid include (1)
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: invalid include (2)
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: Header
+!! options
+djvu
+title="Test/Chapter 2"
+!! wikitext
+
+!! html
+
+Lorem Ipsum -- Author:Me
+II -- 1
+Test/Chapter 1 -- Chapter 3II
+Page 21Page 3
+
+
+
+!! end
diff --git a/tests/parser/proofreadpage_pages_pagelist_ignored.txt 
b/tests/parser/proofreadpage_pages_pagelist_ignored.txt
deleted file mode 100644
index f9c1b0c..000
--- a/tests/parser/proofreadpage_pages_pagelist_ignored.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-!! test
-pages: with file: Simple transclusion
-!! options
-djvu
-!! 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: index content handler

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328543 )

Change subject: index content handler
..

index content handler

Change-Id: If38aadd396186049cbc35302723fc14c3749822f
---
M ProofreadPage.body.php
M extension.json
A includes/index/IndexContent.php
A includes/index/IndexContentHandler.php
A maintenance/fixProofreadIndexPagesContentModel.php
A tests/includes/index/IndexContentHandlerTest.php
A tests/includes/index/IndexContentTest.php
7 files changed, 699 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/43/328543/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index a29dd54..904ffe6 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -91,6 +91,9 @@
if ( $title->inNamespace( self::getPageNamespaceId() ) ) {
$model = CONTENT_MODEL_PROOFREAD_PAGE;
return false;
+   } elseif ( $title->inNamespace( self::getIndexNamespaceId() ) ) 
{
+   $model = CONTENT_MODEL_PROOFREAD_INDEX;
+   return false;
} else {
return true;
}
@@ -701,6 +704,7 @@
// fix issue with content type hardcoded in database
if ( isset( $wgContentHandlerUseDB ) && $wgContentHandlerUseDB 
) {
$updater->addPostDatabaseUpdateMaintenance( 
'FixProofreadPagePagesContentModel' );
+   $updater->addPostDatabaseUpdateMaintenance( 
'FixProofreadIndexPagesContentModel' );
}
 
return true;
@@ -876,6 +880,8 @@
 
// Content handler
define( 'CONTENT_MODEL_PROOFREAD_PAGE', 'proofread-page' );
+   define( 'CONTENT_MODEL_PROOFREAD_INDEX', 'proofread-index' );
$wgContentHandlers[CONTENT_MODEL_PROOFREAD_PAGE] = 
'\ProofreadPage\Page\PageContentHandler';
+   $wgContentHandlers[CONTENT_MODEL_PROOFREAD_INDEX] = 
'\ProofreadPage\Index\IndexContentHandler';
}
 }
diff --git a/extension.json b/extension.json
index 31cd4ed..15a115f 100644
--- a/extension.json
+++ b/extension.json
@@ -59,6 +59,9 @@
"ProofreadIndexValueArc": 
"includes/index/ProofreadIndexValue.php",
"ProofreadIndexValueArk": 
"includes/index/ProofreadIndexValue.php",
"ProofreadIndexPage": "includes/index/ProofreadIndexPage.php",
+   "ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
+   "ProofreadPage\\Index\\IndexContentHandler": 
"includes/index/IndexContentHandler.php",
+   "ProofreadPage\\Index\\PropertyConfigFactory": 
"includes/index/PropertyConfigFactory.php",
"ProofreadIndexDbConnector": 
"includes/index/ProofreadIndexDbConnector.php",
"ProofreadPage\\Pagination\\PaginationFactory": 
"includes/Pagination/PaginationFactory.php",
"ProofreadPage\\Pagination\\PageNumber": 
"includes/Pagination/PageNumber.php",
@@ -92,12 +95,13 @@
"PagesWithoutScans": "SpecialPagesWithoutScans.php",
"ApiQueryProofread": "ApiQueryProofread.php",
"ApiQueryProofreadInfo": "ApiQueryProofreadInfo.php",
-   "FixProofreadPagePagesContentModel": 
"maintenance/fixProofreadPagePagesContentModel.php",
"ProofreadPage\\FileProviderMock": 
"tests/phpunit/FileProviderMock.php",
"ProofreadPageTestCase": 
"tests/phpunit/ProofreadPageTestCase.php",
"ProofreadIndexPageTest": 
"tests/phpunit/index/ProofreadIndexPageTest.php",
"ProofreadPagePageTest": 
"tests/phpunit/page/ProofreadPagePageTest.php",
-   "ProofreadPage\\Page\\PageContentTest": 
"tests/phpunit/page/PageContentTest.php"
+   "ProofreadPage\\Page\\PageContentTest": 
"tests/phpunit/page/PageContentTest.php",
+   "FixProofreadPagePagesContentModel": 
"maintenance/fixProofreadPagePagesContentModel.php",
+   "FixProofreadIndexPagesContentModel": 
"maintenance/fixProofreadIndexPagesContentModel.php"
},
"ResourceModules": {
"jquery.mousewheel": {
diff --git a/includes/index/IndexContent.php b/includes/index/IndexContent.php
new file mode 100644
index 000..06f5d1f
--- /dev/null
+++ b/includes/index/IndexContent.php
@@ -0,0 +1,168 @@
+fields = $fields;
+
+   parent::__construct( '', CONTENT_MODEL_PROOFREAD_INDEX );
+   }
+
+   /**
+* Returns an associative array property name => value as 
WikitextContent
+* @return WikitextContent[]
+*/
+   public function getFields() {
+   return $this->fields;
+   }
+
+   /**
+* @see Content:isEmpty
+*/
+   public function isEmpty() {
+   

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes sure that "Proofread tools" toolbar is always loaded a...

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327027 )

Change subject: Makes sure that "Proofread tools" toolbar is always loaded 
after Page: pages edit interface setup
..

Makes sure that "Proofread tools" toolbar is always loaded after Page: pages 
edit interface setup

Bug: T152945
Change-Id: Ib3acca7a464dc086f0f4deb05e4c2c9ddffe6513
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 14 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/27/327027/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 720440b..575f9cd 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -138,9 +138,9 @@
}
 
/**
-* Add some buttons to the toolbar
+* Setup the editing interface
 */
-   function addButtons() {
+   function setupWikitextEditor() {
var iconPath = mw.config.get( 'wgExtensionAssetsPath' ) + 
'/ProofreadPage/modules/page/images/',
tools = {
zoom: {
@@ -222,6 +222,10 @@
 
if ( getBooleanUserOption( 'usebetatoolbar' ) ) {
mw.loader.using( 'ext.wikiEditor.toolbar', function () {
+   $editForm.find( '.prp-page-edit-body' ).append( 
$( '#wpTextbox1' ) );
+   $editForm.find( '.editOptions' ).before( 
$editForm.find( '.wikiEditor-ui' ) );
+   $editForm.find( '.wikiEditor-ui-text' ).append( 
$editForm.find( '.prp-page-container' ) );
+
$edit.wikiEditor( 'addToToolbar', {
sections: {
'proofreadpage-tools': {
@@ -232,6 +236,13 @@
}
} );
} );
+
+   // load the "dialogs" module of WikiEditor if enabled , 
bug: 72960
+   if ( getBooleanUserOption( 'usebetatoolbar-cgd' ) ) {
+   mw.loader.load( 'ext.wikiEditor.dialogs' );
+   }
+
+   // TODO: other modules of WikiEditor may miss, see bug 
72960.
} else if ( getBooleanUserOption( 'showtoolbar' ) ) {
mw.loader.using( 'mediawiki.toolbar', function () {
$.each( tools, function ( group, list ) {
@@ -248,27 +259,6 @@
}
 
/**
-* Improve the WikiEditor interface
-*/
-   function setupWikiEditor() {
-   // Ignore "showtoolbar", for consistency with the default 
behavior (bug 30795)
-   if ( !getBooleanUserOption( 'usebetatoolbar' ) ) {
-   return;
-   }
-   mw.loader.using( 'ext.wikiEditor', function () {
-   $editForm.find( '.prp-page-edit-body' ).append( $( 
'#wpTextbox1' ) );
-   $editForm.find( '.editOptions' ).before( 
$editForm.find( '.wikiEditor-ui' ) );
-   $editForm.find( '.wikiEditor-ui-text' ).append( 
$editForm.find( '.prp-page-container' ) );
-   } );
-
-   // load the "dialogs" module of WikiEditor if enabled , bug: 
72960
-   if ( getBooleanUserOption( 'usebetatoolbar-cgd' ) ) {
-   mw.loader.load( 'ext.wikiEditor.dialogs' );
-   }
-   // TODO: other modules of WikiEditor may miss, see bug 72960.
-   }
-
-   /**
 * Init global variables of the script
 */
function initEnvironment() {
@@ -282,10 +272,9 @@
 
$( function () {
initEnvironment();
-   setupWikiEditor();
+   setupWikitextEditor();
setupPreferences();
setupPageQuality();
-   addButtons();
} );
 
// zoom should be initialized after the page is rendered

-- 
To view, visit https://gerrit.wikimedia.org/r/327027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3acca7a464dc086f0f4deb05e4c2c9ddffe6513
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Reduce main edit box height when editin in vertical mode

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: Reduce main edit box height when editin in vertical mode
..


Reduce main edit box height when editin in vertical mode

This change makes the main text box smaller so that it all can be
visible on the screen along with the image above it. Both are set
to the same height of one-third of the window height.

When switching back to the default horizonal mode, the image and
the text box are returned to their default sizes.

This also fixes a bug whereby the zoom initialization was setting
the image height too late, and so the image was displaying at full
height.

Bug: T145923
Change-Id: I6d2ec037f0633c413e3d225c2477e29f73200b36
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 12 insertions(+), 5 deletions(-)

Approvals:
  Tpt: Looks good to me, approved
  Samwilson: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index c9cd2ee..720440b 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -65,7 +65,7 @@
 * Put the scan image on top or on the left of the edit area
 */
function toggleLayout() {
-   var $container;
+   var $container, newHeight;
if ( $zoomImage.data( 'prpZoom' ) ) {
$zoomImage.prpZoom( 'destroy' );
}
@@ -75,12 +75,15 @@
if ( isLayoutHorizontal ) {
$container.appendTo( $editForm.find( 
'.prp-page-container' ) );
 
+   // Switch CSS widths and heights back to the default 
side-by-size layout.
$container.css( {
-   width: ''
+   width: '',
+   height: ''
} );
$editForm.find( '.prp-page-content' ).css( {
width: ''
} );
+   $( '#wpTextbox1' ).css( { height: '' } );
ensureImageZoomInitialization();
 
isLayoutHorizontal = false;
@@ -88,6 +91,7 @@
} else {
$container.insertBefore( $editForm );
 
+   // Set the width and height of the image and form.
$container.css( {
width: '100%',
overflow: 'auto',
@@ -97,11 +101,14 @@
width: '100%'
} );
 
-   $container.css( {
-   height: $( window ).height() / 3 + 'px'
-   } );
+   // Turn on image zoom before setting the image height, 
or it'll be overridden.
ensureImageZoomInitialization();
 
+   // Set the image and the edit box to the same height 
(of 1/3 of the window each).
+   newHeight = $( window ).height() / 3 + 'px';
+   $container.css( { height: newHeight } );
+   $( '#wpTextbox1' ).css( { height: newHeight } );
+
isLayoutHorizontal = true;
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/311929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d2ec037f0633c413e3d225c2477e29f73200b36
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Initializes the zoom widget after page loading

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311769

Change subject: Initializes the zoom widget after page loading
..

Initializes the zoom widget after page loading

Bug: T145724
Change-Id: I310d5d6acc0db54a0ae97fbe8727549eec842692
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/69/311769/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 8d7b1fc..ca3d0b9 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -77,6 +77,7 @@
$editForm.find( '.prp-page-content' ).css( {
width: ''
} );
+   withImageZoom( function () {} );
 
isLayoutHorizontal = false;
 
@@ -95,6 +96,7 @@
$container.css( {
height: $( window ).height() / 3 + 'px'
} );
+   withImageZoom( function () {} );
 
isLayoutHorizontal = true;
}
@@ -275,4 +277,10 @@
addButtons();
} );
 
+   // zoom should be initialized after the page is rendered
+   $( window ).load( function () {
+   initEnvironment();
+   withImageZoom( function () {} );
+   } );
+
 }( mw, jQuery ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/311769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I310d5d6acc0db54a0ae97fbe8727549eec842692
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes sure that the zoom widget is initialized before zoomin...

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311743

Change subject: Makes sure that the zoom widget is initialized before zooming 
in/out
..

Makes sure that the zoom widget is initialized before zooming in/out

Initialized lazily the zoom widget

Change-Id: Ia92b41716b3fde4b5e3aeb8c82f5f8e8d012f620
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 26 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/43/311743/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 874f9e7..ba1c957 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -30,6 +30,23 @@
}
 
/**
+* Ensure that the zoom system is properly initialized
+ *
+* @param {Function} callback a function to use after making sure that 
the zoom system is activate
+*/
+   function withImageZoom( callback ) {
+   if ( $zoomImage.data( 'prpZoom' ) ) {
+   callback();
+   return;
+   }
+
+   mw.loader.using( 'jquery.prpZoom', function () {
+   $zoomImage.prpZoom();
+   callback();
+   } );
+   }
+
+   /**
 * Show or hide header and footer areas
 *
 * @param {string} speed string speed of the toggle. May be 'fast', 
'slow' or undefined
@@ -61,8 +78,6 @@
width: ''
} );
 
-   $zoomImage.prpZoom();
-
isLayoutHorizontal = false;
 
} else {
@@ -77,7 +92,6 @@
width: '100%'
} );
 
-   $zoomImage.prpZoom();
$container.css( {
height: $( window ).height() / 3 + 'px'
} );
@@ -127,7 +141,9 @@
action: {
type: 
'callback',
execute: 
function () {
-   
$zoomImage.prpZoom( 'zoomIn' );
+   
withImageZoom( function () {
+   
$zoomImage.prpZoom( 'zoomIn' );
+   } );
}
}
},
@@ -139,7 +155,9 @@
action: {
type: 
'callback',
execute: 
function () {
-   
$zoomImage.prpZoom( 'zoomOut' );
+   
withImageZoom( function () {
+   
$zoomImage.prpZoom( 'zoomOut' );
+   } );
}
}
},
@@ -151,7 +169,9 @@
action: {
type: 
'callback',
execute: 
function () {
-   
$zoomImage.prpZoom( 'reset' );
+   
withImageZoom( function () {
+   
$zoomImage.prpZoom( 'reset' );
+   } );
}
}
}
@@ -247,15 +267,6 @@
}
}
 
-   /**
-* Init the zoom system
-*/
-   function initZoom() {
-   mw.loader.using( 'jquery.prpZoom', function () {
-   $zoomImage.prpZoom();
-   } );
-   }
-
$( document ).ready( function () {
initEnvironment();
setupWikiEditor();
@@ 

[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: Makes sure that created articles in parser tests are unique

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310740

Change subject: Makes sure that created articles in parser tests are unique
..

Makes sure that created articles in parser tests are unique

Change-Id: I833d884c50af4bda60738ebce4835cf9c00b7bce
---
M lstIncorrectParserTest.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LabeledSectionTransclusion
 refs/changes/40/310740/1

diff --git a/lstIncorrectParserTest.txt b/lstIncorrectParserTest.txt
index 74e6cc3..8e366d8 100644
--- a/lstIncorrectParserTest.txt
+++ b/lstIncorrectParserTest.txt
@@ -21,7 +21,7 @@
 
 # Standard articles
 !! article
-Sections
+SectionsDuplicates
 !! text
 1 sec 1
 

-- 
To view, visit https://gerrit.wikimedia.org/r/310740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I833d884c50af4bda60738ebce4835cf9c00b7bce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LabeledSectionTransclusion
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Removes duplicates articles creation in parser tests

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310738

Change subject: Removes duplicates articles creation in parser tests
..

Removes duplicates articles creation in parser tests

Bug: T145724
Change-Id: Ida402a80ddf39ddadcd21578f8de6a600c723859
---
M extension.json
A tests/parser/proofreadpage_articles_creation.txt
M tests/parser/proofreadpage_pagelist.txt
M tests/parser/proofreadpage_pages.txt
4 files changed, 106 insertions(+), 138 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/38/310738/1

diff --git a/extension.json b/extension.json
index 8624f26..cea5349 100644
--- a/extension.json
+++ b/extension.json
@@ -318,6 +318,7 @@
]
},
"ParserTestFiles": [
+   "tests/parser/proofreadpage_articles_creation.txt",
"tests/parser/proofreadpage_pagelist.txt",
"tests/parser/proofreadpage_pages.txt",
"tests/parser/proofreadpage_pagequality.txt"
diff --git a/tests/parser/proofreadpage_articles_creation.txt 
b/tests/parser/proofreadpage_articles_creation.txt
new file mode 100644
index 000..8ef36b2
--- /dev/null
+++ b/tests/parser/proofreadpage_articles_creation.txt
@@ -0,0 +1,105 @@
+!!article
+MediaWiki:Proofreadpage pagenum template
+!!text
+[[{{{page}}}|{{{num}}}]]
+!!endarticle
+
+!!article
+MediaWiki:Proofreadpage header template
+!!text
+{{{title}}} -- {{{author}}}
+{{{from}}} -- {{{to}}}
+{{{prev}}} -- {{{next}}}
+!!endarticle
+
+!!article
+Index:Test
+!!text
+{{
+|Title=Title
+|Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] [[Page:Test 3.png|2]]
+|Author=[[Author:Me]]
+|TOC=* [[Test/Chapter 1]]
+* [[Test/Chapter 2|Chapter 2]]
+* [[Test/Chapter 3|Chapter 3]]
+}}
+!!endarticle
+
+!!article
+Index:LoremIpsum.djvu
+!!text
+{{
+|Title=Lorem Ipsum
+|Pages= 
+|Author=[[Author:Me]]
+|TOC=* [[Test/Chapter 1]]
+* [[Test/Chapter 2|Chapter 2]]
+* [[Test/Chapter 3|Chapter 3]]
+}}
+!!endarticle
+
+!!article
+Page:Test 1.jpg
+!!text
+Test 1
+!!endarticle
+
+!!article
+Page:Test 2.tiff
+!!text
+Test 2
+!!endarticle
+
+!!article
+Page:Test 3.png
+!!text
+
+
+Test 3
+!!endarticle
+
+!!article
+Page:LoremIpsum.djvu/1
+!!text
+Page 1
+!!endarticle
+
+!!article
+Page:LoremIpsum.djvu/2
+!!text
+
+
+Page 2
+!!endarticle
+
+!!article
+Page:LoremIpsum.djvu/3
+!!text
+Page 3
+!!endarticle
+
+!!article
+Page:LoremIpsum.djvu/4
+!!text
+Page 4
+!!endarticle
+
+!!article
+Author:Me
+!!text
+!!endarticle
+
+!!article
+Test/Chapter 1
+!!text
+!!endarticle
+
+!!article
+Test/Chapter 2
+!!text
+!!endarticle
+
+!!article
+Test/Chapter 3
+!!text
+!!endarticle
diff --git a/tests/parser/proofreadpage_pagelist.txt 
b/tests/parser/proofreadpage_pagelist.txt
index 58212fe..7aa2bf2 100644
--- a/tests/parser/proofreadpage_pagelist.txt
+++ b/tests/parser/proofreadpage_pagelist.txt
@@ -2,38 +2,6 @@
 pagelist
 !! endhooks
 
-!!article
-Page:LoremIpsum.djvu/2
-!!text
-Lorem ipsum dolor sic amet
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/1
-!!text
-Page 1
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/2
-!!text
-
-
-Page 2
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/3
-!!text
-Page 3
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/4
-!!text
-Page 4
-!!endarticle
-
 !! test
 pagelist: in a not Index: page
 !! options
diff --git a/tests/parser/proofreadpage_pages.txt 
b/tests/parser/proofreadpage_pages.txt
index 0640e3e..863ce15 100644
--- a/tests/parser/proofreadpage_pages.txt
+++ b/tests/parser/proofreadpage_pages.txt
@@ -2,112 +2,6 @@
 pages
 !! endhooks
 
-!!article
-MediaWiki:Proofreadpage pagenum template
-!!text
-[[{{{page}}}|{{{num}}}]]
-!!endarticle
-
-!!article
-MediaWiki:Proofreadpage header template
-!!text
-{{{title}}} -- {{{author}}}
-{{{from}}} -- {{{to}}}
-{{{prev}}} -- {{{next}}}
-!!endarticle
-
-!!article
-Index:Test
-!!text
-{{
-|Title=Title
-|Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] [[Page:Test 3.png|2]]
-|Author=[[Author:Me]]
-|TOC=* [[Test/Chapter 1]]
-* [[Test/Chapter 2|Chapter 2]]
-* [[Test/Chapter 3|Chapter 3]]
-}}
-!!endarticle
-
-!!article
-Index:LoremIpsum.djvu
-!!text
-{{
-|Title=Lorem Ipsum
-|Pages= 
-|Author=[[Author:Me]]
-|TOC=* [[Test/Chapter 1]]
-* [[Test/Chapter 2|Chapter 2]]
-* [[Test/Chapter 3|Chapter 3]]
-}}
-!!endarticle
-
-!!article
-Page:Test 1.jpg
-!!text
-Test 1
-!!endarticle
-
-!!article
-Page:Test 2.tiff
-!!text
-Test 2
-!!endarticle
-
-!!article
-Page:Test 3.png
-!!text
-
-
-Test 3
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/1
-!!text
-Page 1
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/2
-!!text
-
-
-Page 2
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/3
-!!text
-Page 3
-!!endarticle
-
-!!article
-Page:LoremIpsum.djvu/4
-!!text
-Page 4
-!!endarticle
-
-!!article
-Author:Me
-!!text
-!!endarticle
-
-!!article
-Test/Chapter 1
-!!text
-!!endarticle
-
-!!article
-Test/Chapter 2
-!!text
-!!endarticle
-
-!!article

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Do not localize content model name inside of english excepti...

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/307053

Change subject: Do not localize content model name inside of english exception 
messages
..

Do not localize content model name inside of english exception messages

Bug: T143889
Change-Id: I2d8004123ca6ae94219bd7880beb1c274ce13417
---
M includes/EditPage.php
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/307053/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0da7e6e..f954529 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2494,8 +2494,7 @@
}
 
if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
-   throw new MWException( 'This content model is not 
supported: '
-   . ContentHandler::getLocalizedName( 
$content->getModel() ) );
+   throw new MWException( 'This content model is not 
supported: ' . $content->getModel() );
}
 
return $content->serialize( $this->contentFormat );
@@ -2526,8 +2525,7 @@
$this->contentModel, $this->contentFormat );
 
if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
-   throw new MWException( 'This content model is not 
supported: '
-   . ContentHandler::getLocalizedName( 
$content->getModel() ) );
+   throw new MWException( 'This content model is not 
supported: ' . $content->getModel() );
}
 
return $content;

-- 
To view, visit https://gerrit.wikimedia.org/r/307053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d8004123ca6ae94219bd7880beb1c274ce13417
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Removes backcompatibility code

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/302299

Change subject: Removes backcompatibility code
..

Removes backcompatibility code

Not useful anymore as this extension is lready not working with MW version < 
1.25

Change-Id: I2a5ce1cb63f4e9aa47e3595f24d9b9c8e42c10f3
---
M ApiQueryProofread.php
M ApiQueryProofreadInfo.php
M ProofreadPage.body.php
3 files changed, 12 insertions(+), 69 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/99/302299/1

diff --git a/ApiQueryProofread.php b/ApiQueryProofread.php
index 45ad0b2..81ba545 100644
--- a/ApiQueryProofread.php
+++ b/ApiQueryProofread.php
@@ -64,15 +64,10 @@
 
$api = new ApiMain( $params );
$api->execute();
-   if ( defined( 'ApiResult::META_CONTENT' ) ) {
-   $data = $api->getResult()->getResultData();
-   $pages = ApiResult::stripMetadataNonRecursive(
-   (array)$data['query']['pages']
-   );
-   } else {
-   $data = $api->getResultData();
-   $pages = $data['query']['pages'];
-   }
+   $data = $api->getResult()->getResultData();
+   $pages = ApiResult::stripMetadataNonRecursive(
+   (array)$data['query']['pages']
+   );
unset( $api );
 
if ( array_key_exists( 'error', $data ) ) {
@@ -105,22 +100,6 @@
 
public function getAllowedParams() {
return [];
-   }
-
-   /**
-* @deprecated since MediaWiki core 1.25
-*/
-   public function getDescription() {
-   return 'Returns information about the current proofread status 
of the given pages.';
-   }
-
-   /**
-* @deprecated since MediaWiki core 1.25
-*/
-   public function getExamples() {
-   return [
-   'api.php?action=query=allpages=' 
. ProofreadPage::getPageNamespaceId() . '=proofread'
-   ];
}
 
/**
diff --git a/ApiQueryProofreadInfo.php b/ApiQueryProofreadInfo.php
index 1184379..0d8d81e 100644
--- a/ApiQueryProofreadInfo.php
+++ b/ApiQueryProofreadInfo.php
@@ -87,37 +87,6 @@
}
 
/**
-* @deprecated since MediaWiki core 1.25
-*/
-   public function getParamDescription() {
-   return [
-   'prop' => [
-   'Which proofread properties to get:',
-   ' namespaces- Information about 
Page and Index namespaces',
-   ' qualitylevels - List of proofread 
quality levels'
-   ]
-   ];
-   }
-
-   /**
-* @deprecated since MediaWiki core 1.25
-*/
-   public function getDescription() {
-   return 'Return information about configuration of ProofreadPage 
extension';
-   }
-
-   /**
-* @deprecated since MediaWiki core 1.25
-*/
-   public function getExamples() {
-   return [
-   'api.php?action=query=proofreadinfo',
-   
'api.php?action=query=proofreadinfo=namespaces|qualitylevels',
-   
'api.php?action=query=proofreadinfo=namespaces',
-   ];
-   }
-
-   /**
 * @see ApiBase::getExamplesMessages()
 */
protected function getExamplesMessages() {
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 3b51d76..6c3b8e1 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -448,7 +448,7 @@
 */
public static function updatePrIndex( $index, $deletedPage = null ) {
$indexTitle = $index->getTitle();
-   $indexId = $index->getID();
+   $indexId = $index->getId();
 
// read the list of pages
$pages = [];
@@ -457,7 +457,7 @@
);
foreach ( $pagination as $page ) {
if ( $deletedPage === null || 
!$page->getTitle()->equals( $deletedPage ) ) {
-   array_push( $pages, 
$page->getTitle()->getDBKey() );
+   array_push( $pages, 
$page->getTitle()->getDBkey() );
}
}
 
@@ -622,7 +622,7 @@
}
 
if ( isset( $ourStatus ) ) {
-   $ourStatus->value = self::AS_HOOK_ERROR;
+   $ourStatus->value = EditPage::AS_HOOK_ERROR;
$status->merge( $ourStatus );
return false;
}
@@ -694,7 +694,7 @@
 
$dir = __DIR__ . '/sql/';
 
-   $updater->addExtensionTable( 'pr_index', $dir . 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Fixes PHPdoc tag spelling

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/302295

Change subject: Fixes PHPdoc tag spelling
..

Fixes PHPdoc tag spelling

Change-Id: I6031cf62a464f37162ad253ef84ee75d4e6a660c
---
M ProofreadPage.body.php
M includes/index/ProofreadIndexPage.php
M includes/page/ProofreadPagePage.php
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/95/302295/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 3b51d76..7a1a34a 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -33,7 +33,7 @@
 class ProofreadPage {
 
/**
-* @depreciated use Context::getPageNamespaceId
+* @deprecated use Context::getPageNamespaceId
 *
 * Returns id of Page namespace.
 *
@@ -44,7 +44,7 @@
}
 
/**
-* @depreciated use Context::getIndexNamespaceId
+* @deprecated use Context::getIndexNamespaceId
 *
 * Returns id of Index namespace.
 *
diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index 62d4372..5f8f028 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -87,7 +87,7 @@
}
 
/**
-* @depreciated use FileProvider::getForIndexPage
+* @deprecated use FileProvider::getForIndexPage
 *
 * Return Scan of the book if it exist or false.
 * @return File|false
diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
index 7516e64..f2a2cb3 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -129,7 +129,7 @@
}
 
/**
-* @depreciated use FileProvider::getForPagePage
+* @deprecated use FileProvider::getForPagePage
 *
 * Return image of the page if it exist or false.
 * @return File|false

-- 
To view, visit https://gerrit.wikimedia.org/r/302295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6031cf62a464f37162ad253ef84ee75d4e6a660c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Optimises imports

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/301925

Change subject: Optimises imports
..

Optimises imports

Change-Id: I9fbf5bd25438afe3ff25fc3afa976079f8ebe933
---
M includes/Context.php
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagesTagParser.php
M tests/includes/Pagination/FilePaginationTest.php
M tests/includes/index/ProofreadIndexPageTest.php
5 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/25/301925/1

diff --git a/includes/Context.php b/includes/Context.php
index d34bed9..20bb074 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -3,7 +3,6 @@
 namespace ProofreadPage;
 
 use ProofreadPage\Pagination\PaginationFactory;
-use ProofreadPage\ProofreadPageInit;
 use RepoGroup;
 
 /**
diff --git a/includes/Parser/PagelistTagParser.php 
b/includes/Parser/PagelistTagParser.php
index 76d1117..bddbb32 100644
--- a/includes/Parser/PagelistTagParser.php
+++ b/includes/Parser/PagelistTagParser.php
@@ -3,7 +3,6 @@
 namespace ProofreadPage\Parser;
 
 use ProofreadIndexPage;
-use ProofreadPage;
 use ProofreadPage\FileNotFoundException;
 use ProofreadPage\Pagination\FilePagination;
 use ProofreadPage\Pagination\PageList;
diff --git a/includes/Parser/PagesTagParser.php 
b/includes/Parser/PagesTagParser.php
index 7f90117..ae637f4 100644
--- a/includes/Parser/PagesTagParser.php
+++ b/includes/Parser/PagesTagParser.php
@@ -4,7 +4,6 @@
 
 use OutOfBoundsException;
 use ProofreadIndexPage;
-use ProofreadPage;
 use ProofreadPage\Pagination\FilePagination;
 use ProofreadPageDbConnector;
 use ProofreadPagePage;
diff --git a/tests/includes/Pagination/FilePaginationTest.php 
b/tests/includes/Pagination/FilePaginationTest.php
index cd3e9c3..a37d9e0 100644
--- a/tests/includes/Pagination/FilePaginationTest.php
+++ b/tests/includes/Pagination/FilePaginationTest.php
@@ -2,7 +2,6 @@
 
 namespace ProofreadPage\Pagination;
 
-use File;
 use InvalidArgumentException;
 use OutOfBoundsException;
 use ProofreadIndexPageTest;
diff --git a/tests/includes/index/ProofreadIndexPageTest.php 
b/tests/includes/index/ProofreadIndexPageTest.php
index 5eb0455..55be1a9 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -1,8 +1,5 @@
 https://gerrit.wikimedia.org/r/301925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fbf5bd25438afe3ff25fc3afa976079f8ebe933
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Adds Page: pages outputted by tag as dependenc...

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/301924

Change subject: Adds Page: pages outputted by  tag as dependencies 
of the current page
..

Adds Page: pages outputted by  tag as dependencies of the current 
page

Warning: it may be very expensive, especially with this implementation as its 
could add hundreds of new dependencies and of DB lookups to a given Index: page.

Bug: T114318
Change-Id: I8b8dbf0a1c8102a3543da28814877eec461b07d2
---
M includes/Parser/PagelistTagParser.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/24/301924/1

diff --git a/includes/Parser/PagelistTagParser.php 
b/includes/Parser/PagelistTagParser.php
index 76d1117..5bd210f 100644
--- a/includes/Parser/PagelistTagParser.php
+++ b/includes/Parser/PagelistTagParser.php
@@ -75,6 +75,12 @@
if ( $pageNumber->isEmpty() || !$title ) {
$return .= $view . ' ';
} else {
+   // Add the page as a dependence in order to make 
sure that the Index: page is purged if the status of the Page: page changes
+   $this->parser->getOutput()->addTemplate(
+   $pageTitle,
+$pageTitle->getArticleID(),
+$pageTitle->getLatestRevID()
+);
$return .= '[[' . $pageTitle->getPrefixedText() 
. '|' . $view . ']] '; // TODO: use linker?
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/301924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b8dbf0a1c8102a3543da28814877eec461b07d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Deploys the Kartographer extension to Metawiki - change (operations/mediawiki-config)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/298042

Change subject: Deploys the Kartographer extension to Metawiki
..

Deploys the Kartographer extension to Metawiki

Bug: T139787
Change-Id: I04d2ebf9297e136386bd347ab07e596f36f9ab6c
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/42/298042/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 80d2621..d35f3de 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17115,6 +17115,7 @@
'test2wiki' => true,
'testwikidatawiki' => true,
'mediawikiwiki' => true,
+   'metawiki' => true,
'plwikimedia' => true, // T132510
 ],
 

-- 
To view, visit https://gerrit.wikimedia.org/r/298042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04d2ebf9297e136386bd347ab07e596f36f9ab6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adds HTML classes based on rank to statement widgets - change (mediawiki...Wikibase)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296078

Change subject: Adds HTML classes based on rank to statement widgets
..

Adds HTML classes based on rank to statement widgets

Allows to style statement widgets based on the rank e.g. highlight the prefered 
ranks

Change-Id: I149114e4d65c55668b6dd684ae05f08c8f9e386e
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M view/resources/templates.php
M view/src/ClaimHtmlGenerator.php
3 files changed, 50 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/78/296078/1

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 848c741..d793317 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -68,6 +68,13 @@
function() { // GUID
return ( this.options.value && 
this.options.value.getClaim().getGuid() ) || 'new';
},
+   function() { // Rank string
+   return this._getRankString(
+   this.options.value
+   ? this.options.value.getRank()
+   : 
wb.datamodel.Statement.RANK.NORMAL
+   );
+   },
function() { // Rank selector
return $( '' );
},
@@ -843,6 +850,28 @@
 */
focus: function() {
this._mainSnakSnakView.focus();
+   },
+
+   /**
+* Returns a `RANK`'s serialized string.
+*
+* @see wikibase.datamodel.Statement.RANK
+* @ignore
+*
+* @param {number} rank
+* @return {string|null}
+*/
+   _getRankString: function( rank ) {
+   var rankString = null;
+
+   $.each( wb.datamodel.Statement.RANK, function( rankId, i ) {
+   if ( rank === i ) {
+   rankString = rankId.toLowerCase();
+   }
+   return rankString === null;
+   } );
+
+   return rankString;
}
 } );
 
diff --git a/view/resources/templates.php b/view/resources/templates.php
index e971bb4..48adf44 100644
--- a/view/resources/templates.php
+++ b/view/resources/templates.php
@@ -89,16 +89,16 @@
 
$templates['wikibase-statementview'] =
 <<
-   $2
+
+   $3

-   $3
-   $4
+   $4
+   $5

-   $5
+   $6

-   $6
-   $7
+   $7
+   $8

 
 HTML;
diff --git a/view/src/ClaimHtmlGenerator.php b/view/src/ClaimHtmlGenerator.php
index 9d4c670..12131a5 100644
--- a/view/src/ClaimHtmlGenerator.php
+++ b/view/src/ClaimHtmlGenerator.php
@@ -101,6 +101,7 @@
return $this->templateFactory->render(
'wikibase-statementview',
$statement->getGuid(),
+   $this->getRankName( $statement->getRank() ),
$rankHtml,
$mainSnakHtml,
$this->getHtmlForQualifiers( 
$statement->getQualifiers() ),
@@ -232,11 +233,7 @@
 */
private function getRankSelector( $rank ) {
if ( !array_key_exists( $rank, $this->statementRankSelector ) ) 
{
-   $rankName = [
-   Statement::RANK_DEPRECATED => 'deprecated',
-   Statement::RANK_NORMAL => 'normal',
-   Statement::RANK_PREFERRED => 'preferred'
-   ][ $rank ];
+   $rankName = $this->getRankName( $rank );
 
// Messages: wikibase-statementview-rank-preferred, 
wikibase-statementview-rank-normal,
// wikibase-statementview-rank-deprecated
@@ -252,4 +249,16 @@
return $this->statementRankSelector[ $rank ];
}
 
+   /**
+* @param int $rank
+*
+* @return string
+*/
+   private function getRankName( $rank ) {
+   return [
+   Statement::RANK_DEPRECATED => 'deprecated',
+   Statement::RANK_NORMAL => 'normal',
+   Statement::RANK_PREFERRED => 'preferred'
+   ][ $rank ];
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/296078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] Disallows insertion before tag - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296053

Change subject: Disallows insertion before  tag
..

Disallows insertion before  tag

Bug: T138518
Change-Id: I2f9ceacedb06eab6047dfb4711ca3d1543e3dd0c
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/53/296053/1

diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 9b0a244..72cfcc0 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -88,6 +88,9 @@
 
// Make image zoomable
this.$zoomImage.prpZoom();
+
+   // Remove insertion before 
+   $( 'div[typeof="mw:Extension/pagequality"]' ).prev().remove();
 };
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/296053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f9ceacedb06eab6047dfb4711ca3d1543e3dd0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Loads PageTarget all the time with VisualEditorPluginModules - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296052

Change subject: Loads PageTarget all the time with VisualEditorPluginModules
..

Loads PageTarget all the time with VisualEditorPluginModules

Bug: T138644
Change-Id: Ic4cbb756033523a537d9e6e2bb4b84cf52ce4369
---
M ProofreadPage.body.php
M extension.json
D modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
3 files changed, 2 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/52/296052/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 899678d..776e39c 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -174,7 +174,6 @@
$out->addModuleStyles( 'ext.proofreadpage.base' );
} elseif ( $title->inNamespace( self::getPageNamespaceId() ) ) {
$out->addModules( 'ext.proofreadpage.page.navigation' );
-   $out->addModules( 
'ext.proofreadpage.ve.pageTarget.init' );
} elseif (
$title->inNamespace( NS_MAIN ) &&
( $out->isArticle() || $isEdit ) &&
diff --git a/extension.json b/extension.json
index cc78d35..793d39e 100644
--- a/extension.json
+++ b/extension.json
@@ -326,7 +326,8 @@
"tests/parser/proofreadpage_pagequality.txt"
],
"VisualEditorPluginModules": [
-   "ext.proofreadpage.ve.node.pages"
+   "ext.proofreadpage.ve.node.pages",
+   "ext.proofreadpage.ve.pageTarget"
],
"VisualEditorAvailableNamespaces": {
"Page": true
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
deleted file mode 100644
index 0d2621d..000
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.init.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
- * VisualEditor MediaWiki Initialization ProofreadPagePageTarget 
initialization.
- *
- * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-if ( mw.loader.getState( 'ext.visualEditor.desktopArticleTarget.init' ) ) {
-   mw.loader.using( 'ext.visualEditor.desktopArticleTarget.init', function 
() {
-   mw.libs.ve.addPlugin( 'ext.proofreadpage.ve.pageTarget' );
-   } );
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/296052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4cbb756033523a537d9e6e2bb4b84cf52ce4369
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Avoids concurrent loading of the regular VE - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295938

Change subject: Avoids concurrent loading of the regular VE
..

Avoids concurrent loading of the regular VE

Change-Id: I6b2d5a5c2707746db88d3ef0d22c825e7ca6f0e8
Task: T138489
Depends-on: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
---
M extension.json
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/38/295938/1

diff --git a/extension.json b/extension.json
index 7769786..cc78d35 100644
--- a/extension.json
+++ b/extension.json
@@ -332,7 +332,7 @@
"Page": true
},
"VisualEditorAvailableContentModels": {
-   "proofread-page": true
+   "proofread-page": "proofread-page"
},
"config": {
"@ProofreadPageNamespaceIds": "Array that contain the ids of 
namespaces used by ProofreadPage",
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 6397a92..1dffa6c 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -45,6 +45,13 @@
 
 OO.inheritClass( ve.init.mw.ProofreadPagePageTarget, 
ve.init.mw.DesktopArticleTarget );
 
+/* Static Properties */
+
+/**
+ * @inheritdoc
+ */
+ve.init.mw.ArticleTarget.static.name = 'proofread-page';
+
 /* Methods */
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/295938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b2d5a5c2707746db88d3ef0d22c825e7ca6f0e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allows to register a specific target per content model - change (mediawiki...VisualEditor)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295936

Change subject: Allows to register a specific target per content model
..

Allows to register a specific target per content model

Change-Id: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
Task: T138489
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
3 files changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/36/295936/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 873b5ba..5de173e 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -665,12 +665,12 @@
$thumbLimits = $coreConfig->get( 'ThumbLimits' );
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$availableNamespaces = 
ApiVisualEditor::getAvailableNamespaceIds( $veConfig );
-   $availableContentModels = array_keys( array_filter(
+   $availableContentModels = array_filter(
array_merge(
ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableContentModels' ),
$veConfig->get( 
'VisualEditorAvailableContentModels' )
)
-   ) );
+   );
 
$vars['wgVisualEditorConfig'] = [
'disableForAnons' => $veConfig->get( 
'VisualEditorDisableForAnons' ),
diff --git a/extension.json b/extension.json
index 810cb8c..f766546 100644
--- a/extension.json
+++ b/extension.json
@@ -104,7 +104,7 @@
"_merge_strategy": "array_plus"
},
"VisualEditorAvailableContentModels": {
-   "wikitext": true,
+   "wikitext": "article",
"_merge_strategy": "array_plus"
},
"VisualEditorSkinToolbarScrollOffset": [],
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d465750..40996bf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -137,7 +137,9 @@
.then( function () {
var target;
 
-   target = 
ve.init.mw.targetFactory.create( 'article' );
+   target = 
ve.init.mw.targetFactory.create(
+   conf.contentModels[ 
mw.config.get( 'wgPageContentModel' ) ]
+   );
target.connect( this, {
transformPage: function () {
if ( onlyTabIsVE ) {
@@ -676,7 +678,7 @@
mw.config.get( 'wgTranslatePageTranslation' ) !== 'translation' 
&&
 
// Only for pages with a supported content model
-   conf.contentModels.indexOf( mw.config.get( 'wgPageContentModel' 
) ) !== -1
+   conf.contentModels.hasOwnProperty( mw.config.get( 
'wgPageContentModel' ) )
);
 
// FIXME: We should do this more elegantly

-- 
To view, visit https://gerrit.wikimedia.org/r/295936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adds support of preload hooks - change (mediawiki...VisualEditor)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295906

Change subject: Adds support of preload hooks
..

Adds support of preload hooks

This is not adding support of preload/editintro parameters

Change-Id: I46ade4de02f15444c1ca5731a475ed89b31960d9
---
M ApiVisualEditor.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/06/295906/1

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index fa6d14f..66db2e7 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -360,6 +360,10 @@
 
} else {
$content = '';
+   Hooks::run( 'EditFormPreloadText', [ 
&$content, &$title ] );
+   if ( $content !== '' ) {
+   $content = 
$this->parseWikitextFragment( $title, $content );
+   }
$baseTimestamp = wfTimestampNow();
$oldid = 0;
$restoring = false;

-- 
To view, visit https://gerrit.wikimedia.org/r/295906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46ade4de02f15444c1ca5731a475ed89b31960d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Debug the onEditFilterMergedContent hook - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295899

Change subject: Debug the onEditFilterMergedContent hook
..

Debug the onEditFilterMergedContent hook

Change-Id: I108c0d1e9d225815e523c04ee8e5a2a862793013
---
M ProofreadPage.body.php
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/99/295899/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index ed727a3..6c7524d 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -20,6 +20,7 @@
  */
 
 use ProofreadPage\Context;
+use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
 use ProofreadPage\FileNotFoundException;
 use ProofreadPage\Pagination\PageNotInPaginationException;
@@ -590,16 +591,16 @@
 * @param $context Object implementing the IContextSource interface.
 * @param $content Content of the edit box, as a Content object.
 * @param $status  Status object to represent errors, etc.
-* @param $summary  Edit summary for page
+* @param $summary Edit summary for page
 * @param $user  The User object representing the user whois performing 
the edit.
 * @param $minoredit  Whether the edit was marked as minor by the user.
 * @return bool
 */
public static function onEditFilterMergedContent( IContextSource 
$context, Content $content,
-   Status $status, string $summary, User $user, boolean $minoredit 
) {
+   Status $status, $summary, User $user, $minoredit ) {
 
// If the content's model isn't ours, ignore this; there's 
nothing for us to do here.
-   if ( ! ( $content->contentModel instanceof ProofreadPageContent 
) ) {
+   if ( ! ( $content instanceof PageContent ) ) {
return true;
}
 
@@ -620,7 +621,7 @@
 
// Fail if the user changed the level and the change isn't 
allowed
if (
-   !$newLevel->equals( $oldLevel ) && 
!$oldLevel->isChangeAllowed( $newLevel )
+   !$oldLevel->isChangeAllowed( $newLevel )
) {
$ourStatus = Status::newFatal( 
'proofreadpage_notallowedtext' );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/295899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I108c0d1e9d225815e523c04ee8e5a2a862793013
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Simplifies the retrieval of user options in JavaScript - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295881

Change subject: Simplifies the retrieval of user options in JavaScript
..

Simplifies the retrieval of user options in JavaScript

Change-Id: I80c92cc3f680cd4c04d8ec500fcd2329561b65b1
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 16 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/81/295881/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 7ed555c..874f9e7 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -20,6 +20,16 @@
$editForm;
 
/**
+* Returns the value of a user option as boolean
+*
+* @param {string} optionId
+* @return {boolean}
+*/
+   function getBooleanUserOption( optionId ) {
+   return Number( mw.user.options.get( optionId ) ) === 1;
+   }
+
+   /**
 * Show or hide header and footer areas
 *
 * @param {string} speed string speed of the toggle. May be 'fast', 
'slow' or undefined
@@ -80,10 +90,10 @@
 * Apply user preferences
 */
function setupPreferences() {
-   if ( !mw.user.options.get( 'proofreadpage-showheaders' ) ) {
+   if ( !getBooleanUserOption( 'proofreadpage-showheaders' ) ) {
toggleHeaders();
}
-   if ( mw.user.options.get( 'proofreadpage-horizontal-layout' ) ) 
{
+   if ( getBooleanUserOption( 'proofreadpage-horizontal-layout' ) 
) {
toggleLayout();
}
}
@@ -177,7 +187,7 @@
},
$edit = $( '#wpTextbox1' );
 
-   if ( mw.user.options.get( 'usebetatoolbar' ) ) {
+   if ( getBooleanUserOption( 'usebetatoolbar' ) ) {
mw.loader.using( 'ext.wikiEditor.toolbar', function () {
$edit.wikiEditor( 'addToToolbar', {
sections: {
@@ -189,7 +199,7 @@
}
} );
} );
-   } else if ( mw.user.options.get( 'showtoolbar' ) ) {
+   } else if ( getBooleanUserOption( 'showtoolbar' ) ) {
mw.loader.using( 'mediawiki.toolbar', function () {
$.each( tools, function ( group, list ) {
$.each( list.tools, function ( id, def 
) {
@@ -209,7 +219,7 @@
 */
function setupWikiEditor() {
// Ignore "showtoolbar", for consistency with the default 
behavior (bug 30795)
-   if ( !mw.user.options.get( 'usebetatoolbar' ) ) {
+   if ( !getBooleanUserOption( 'usebetatoolbar' ) ) {
return;
}
mw.loader.using( 'ext.wikiEditor', function () {
@@ -219,7 +229,7 @@
} );
 
// load the "dialogs" module of WikiEditor if enabled , bug: 
72960
-   if ( mw.user.options.get( 'usebetatoolbar-cgd' ) ) {
+   if ( getBooleanUserOption( 'usebetatoolbar-cgd' ) ) {
mw.loader.load( 'ext.wikiEditor.dialogs' );
}
// TODO: other modules of WikiEditor may miss, see bug 72960.

-- 
To view, visit https://gerrit.wikimedia.org/r/295881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80c92cc3f680cd4c04d8ec500fcd2329561b65b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Removes dead code - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295725

Change subject: Removes dead code
..

Removes dead code

Change-Id: I31cff474041e13c6882ce83d7fea45ecd518450f
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/25/295725/1

diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 40baa84..6397a92 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -154,8 +154,6 @@
doc.createElement( 'footer' )
];
 
-   sectionNodes[ 0 ].setAttribute( 'title', 'Hello' );
-
function bubbleUp( node ) {
var anchor;
while ( node.parentNode !== doc.body ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/295725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31cff474041e13c6882ce83d7fea45ecd518450f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Makes VE -> Wikieditor switch work - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295716

Change subject: Makes VE -> Wikieditor switch work
..

Makes VE -> Wikieditor switch work

Adds a simple Wikitext serialization parser
 We should probably move to an API call in the future (see 
Id34b2c10bbf0cb23643b3b300e3182a4a12c9933 )

Change-Id: I315468a493ba1c770bd1d1fd89e883e9bb5ab53f
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 69 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/16/295716/1

diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 40baa84..3741282 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -138,6 +138,75 @@
 };
 
 /**
+ * @inheritdoc
+ */
+ve.init.mw.ProofreadPagePageTarget.prototype.submit = function ( wikitext, 
fields ) {
+   var key, $form, params, content;
+
+   // Prevent duplicate requests
+   if ( this.submitting ) {
+   return false;
+   }
+   // Save DOM
+   this.submitting = true;
+   content = this.parseWikitext( wikitext );
+   $form = $( '' );
+   params = ve.extendObject( {
+   format: 'text/x-wiki',
+   model: 'proofread-page',
+   oldid: this.requestedRevId,
+   wpStarttime: this.startTimeStamp,
+   wpEdittime: this.baseTimeStamp,
+   wpHeaderTextbox: content.header,
+   wpTextbox1: content.body,
+   wpFooterTextbox: content.footer,
+   wpQuality: content.level.level,
+   wpEditToken: this.editToken
+   }, fields );
+   // Add params as hidden fields
+   for ( key in params ) {
+   $form.append( $( '' ).attr( { type: 'hidden', name: key, 
value: params[ key ] } ) );
+   }
+   // Submit the form, mimicking a traditional edit
+   // Firefox requires the form to be attached
+   $form.attr( 'action', this.submitUrl ).appendTo( 'body' ).submit();
+   return true;
+};
+
+/**
+ * Parse Wikitext into the JSON serialization
+ */
+ve.init.mw.ProofreadPagePageTarget.prototype.parseWikitext = function ( 
wikitext ) {
+   var structureMatchResult, headerMatchResult, result = {
+   header: '',
+   body: '',
+   footer: '',
+   level: {
+   level: 1,
+   user: null
+   }
+   };
+
+   structureMatchResult = wikitext.match( 
/^([\s\S]*)\n*<\/noinclude>([\s\S]*)([\s\S]*)<\/noinclude>$/
 );
+   if ( structureMatchResult === null ) {
+   result.body = wikitext;
+   return result;
+   }
+   result.body = structureMatchResult[ 2 ];
+   result.footer = structureMatchResult[ 3 ];
+
+   headerMatchResult = structureMatchResult[ 1 ].match( /^|> *<\/pagequality>)([\s\S]*)$/ );
+   if ( headerMatchResult === null ) {
+   result.header = structureMatchResult[ 1 ];
+   return result;
+   }
+   result.level.level = parseInt( headerMatchResult[ 1 ] );
+   result.level.user = headerMatchResult[ 2 ];
+   result.header = headerMatchResult[ 4 ];
+   return result;
+};
+
+/**
  * Split a document into balanced header, body and footer sections
  *
  * @param {HTMLDocument} doc Document

-- 
To view, visit https://gerrit.wikimedia.org/r/295716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I315468a493ba1c770bd1d1fd89e883e9bb5ab53f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [WIP] Adds action=reformat API action - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295709

Change subject: [WIP] Adds action=reformat API action
..

[WIP] Adds action=reformat API action

Its goal is to allow to do easy conversion between different versions of the 
same content format

Unit tests are still to add

Change-Id: Id34b2c10bbf0cb23643b3b300e3182a4a12c9933
---
M autoload.php
M includes/api/ApiMain.php
A includes/api/ApiReformat.php
3 files changed, 111 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/295709/1

diff --git a/autoload.php b/autoload.php
index e729b6f..d69ec4d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -129,6 +129,7 @@
'ApiQueryWatchlist' => __DIR__ . '/includes/api/ApiQueryWatchlist.php',
'ApiQueryWatchlistRaw' => __DIR__ . 
'/includes/api/ApiQueryWatchlistRaw.php',
'ApiRawMessage' => __DIR__ . '/includes/api/ApiMessage.php',
+   'ApiReformat' => __DIR__ . '/includes/api/ApiReformat.php',
'ApiRemoveAuthenticationData' => __DIR__ . 
'/includes/api/ApiRemoveAuthenticationData.php',
'ApiResetPassword' => __DIR__ . '/includes/api/ApiResetPassword.php',
'ApiResult' => __DIR__ . '/includes/api/ApiResult.php',
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index ce9587f..606fadb 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -71,6 +71,7 @@
'compare' => 'ApiComparePages',
'tokens' => 'ApiTokens',
'checktoken' => 'ApiCheckToken',
+   'reformat' => 'ApiReformat',
 
// Write modules
'purge' => 'ApiPurge',
diff --git a/includes/api/ApiReformat.php b/includes/api/ApiReformat.php
new file mode 100644
index 000..1204ab2
--- /dev/null
+++ b/includes/api/ApiReformat.php
@@ -0,0 +1,109 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @since 1.28
+ */
+
+/**
+ * API interface for conversion between two different formats of the same 
content model
+ *
+ * @ingroup API
+ */
+class ApiReformat extends ApiBase {
+
+   /**
+* Purges the cache of a page
+*/
+   public function execute() {
+   $params = $this->extractRequestParams();
+   $contentHandler = $this->getContentHandler( 
$params['contentmodel'] );
+   $inputContentFormat = $this->cleanInputContentFormat( 
$params['inputcontentformat'], $contentHandler );
+   $outputContentFormat = $this->cleanOutputContentFormat( 
$params['outputcontentformat'], $contentHandler );
+
+   try {
+   $content = $contentHandler->unserializeContent( 
$params['serialization'], $inputContentFormat );
+   } catch ( MWContentSerializationException $ex ) {
+   $this->dieUsage( $ex->getMessage(), 'parseerror' );
+   return;
+   }
+   $serialization = $contentHandler->serializeContent( $content, 
$outputContentFormat );
+   $apiResult = $this->getResult();
+   $apiResult->addValue( null, 'serialization', $serialization );
+   $apiResult->addValue( null, 'contentmodel', 
$contentHandler->getModelID() );
+   $apiResult->addValue( null, 'contentformat', 
$outputContentFormat );
+   }
+
+   private function getContentHandler( $contentModelId ) {
+   try {
+   return ContentHandler::getForModelID( $contentModelId );
+   } catch ( MWUnknownContentModelException $e ) {
+   $this->dieUsage( $e->getMessage(), 'badparams', 400 );
+   }
+   }
+
+   private function cleanInputContentFormat( $format, ContentHandler 
$contentHandler ) {
+   if( $format !== null && !$contentHandler->isSupportedFormat( 
$format ) ) {
+   $this->dieUsage(
+   "Input format $format is not supported for 
content model " . $contentHandler->getModelID(), 'badparams', 400
+   );
+   }
+   return $format;
+   }
+
+   private function cleanOutputContentFormat( $format, ContentHandler 
$contentHandler ) {
+   if ( $format === null ) {
+   $format = $contentHandler->getDefaultFormat();
+   }
+   if( !$contentHandler->isSupportedFormat( $format ) ) {
+   $this->dieUsage(
+   "Output format $format is not supported for 
content model " . $contentHandler->getModelID(), 'badparams', 400
+   );
+   }
+   return $format;
+   }
+
+   public function getAllowedParams() {
+   return [
+   'serialization' => [
+   ApiBase::PARAM_TYPE => 'string',
+  

[MediaWiki-commits] [Gerrit] Makes sure to remove the WikiEditor UI - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295671

Change subject: Makes sure to remove the WikiEditor UI
..

Makes sure to remove the WikiEditor UI

Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Task: T138393
---
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/71/295671/1

diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 40baa84..92f8d13 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -15,12 +15,15 @@
  * @param {Object} config Configuration options
  */
 ve.init.mw.ProofreadPagePageTarget = function 
VeInitMwProofreadPagePageTarget() {
-   var zoomIn, zoomReset, zoomOut;
+   var zoomIn, zoomReset, zoomOut, $contentText;
 
// Parent method
ve.init.mw.ProofreadPagePageTarget.super.apply( this, arguments );
 
-   this.$element.addClass( 've-init-mw-proofreadPagePageTarget' );
+   $contentText = $( '#mw-content-text' );
+   $contentText.html( $contentText.find( '.prp-page-container' ) );
+
+   this.constructor.static.removeWikiEditor();
 
this.$zoomContainer = $( '' ).addClass( 
've-init-mw-proofreadPagePageTarget-zoomContainer' );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/295671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic89ed528c0ea77fcabc2828265313837f75ea873
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Makes user options also work when the value is "1" instead of 1 - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295644

Change subject: Makes user options also work when the value is "1" instead of 1
..

Makes user options also work when the value is "1" instead of 1

Change-Id: I51723c7f4b1c4166523605774171466592ecb005
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/44/295644/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index e75929e..7ed555c 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -177,7 +177,7 @@
},
$edit = $( '#wpTextbox1' );
 
-   if ( mw.user.options.get( 'usebetatoolbar' ) === 1 ) {
+   if ( mw.user.options.get( 'usebetatoolbar' ) ) {
mw.loader.using( 'ext.wikiEditor.toolbar', function () {
$edit.wikiEditor( 'addToToolbar', {
sections: {
@@ -189,7 +189,7 @@
}
} );
} );
-   } else if ( mw.user.options.get( 'showtoolbar' ) === 1 ) {
+   } else if ( mw.user.options.get( 'showtoolbar' ) ) {
mw.loader.using( 'mediawiki.toolbar', function () {
$.each( tools, function ( group, list ) {
$.each( list.tools, function ( id, def 
) {

-- 
To view, visit https://gerrit.wikimedia.org/r/295644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51723c7f4b1c4166523605774171466592ecb005
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] is now optional in ProofreadPage page... - change (pywikibot/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295626

Change subject:  is now optional in ProofreadPage pages 
serialization
..

 is now optional in ProofreadPage pages serialization

See also: Iabfec73e7d9a667ff6876991a6373fb04ae0c75a

Change-Id: I292895f8edc56aa27475f9afd8732842a8e35fdc
---
M pywikibot/proofreadpage.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/26/295626/1

diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index 6b6e684..491dd2d 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -43,7 +43,7 @@
 re.DOTALL)
 
 _template = (''
- '{0.header}\n\n\n')
+ '(?:){0.header}(?:\n\n\n)')
 
 def __init__(self, text=None):
 """Constructor."""

-- 
To view, visit https://gerrit.wikimedia.org/r/295626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I292895f8edc56aa27475f9afd8732842a8e35fdc
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Avoids to fail if Image::transform returns false - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295531

Change subject: Avoids to fail if Image::transform returns false
..

Avoids to fail if Image::transform returns false

Change-Id: I183a393f1b20d29aa8e764db75f0804f2fe4745f
---
M includes/page/ProofreadPagePage.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/31/295531/1

diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
index 2a4581c..7516e64 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -207,6 +207,9 @@
return null;
}
$thumbnail = $image->transform( $transformAttributes );
+   if ( !$thumbnail ) {
+   return null;
+   }
return $thumbnail->toHtml( $options );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/295531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I183a393f1b20d29aa8e764db75f0804f2fe4745f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] More lenient parser - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295527

Change subject: More lenient  parser
..

More lenient  parser

Change-Id: I577f5f4027f5a245dd88c2fd3324519ff0d29ccf
---
M includes/page/PageContentHandler.php
M tests/includes/page/PageContentHandlerTest.php
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/27/295527/1

diff --git a/includes/page/PageContentHandler.php 
b/includes/page/PageContentHandler.php
index aa5a37a..9ba34b2 100644
--- a/includes/page/PageContentHandler.php
+++ b/includes/page/PageContentHandler.php
@@ -152,7 +152,7 @@
$body = $text;
}
 
-   if ( preg_match( '/^(.*?)$/s', $header, $m ) ) {
+   if ( preg_match( '/^|> *)(.*?)$/s', $header, $m ) ) {
$level = intval( $m[1] );
$proofreader = $m[2];
$header = $this->cleanHeader( $m[3] );
diff --git a/tests/includes/page/PageContentHandlerTest.php 
b/tests/includes/page/PageContentHandlerTest.php
index d0a4015..532889f 100644
--- a/tests/includes/page/PageContentHandlerTest.php
+++ b/tests/includes/page/PageContentHandlerTest.php
@@ -32,7 +32,9 @@
[ 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n\n\n" . 
'Experimental bodyExperimental footer' 
],
[ 'Experimental header', 'Experimental body', '', 2, 
'Woot', 'Experimental 
header' . "\n\n\n" . 'Experimental body' ],
[ 'Experimental header', 'Experimental 
body', 'Experimental footer', 2, 'Woot', 
'Experimental header' . "\n\n\n" . 'Experimental 
bodyExperimental footer' ],
-   [ 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n" . 
'Experimental bodyExperimental footer' 
]
+   [ 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n" . 
'Experimental bodyExperimental footer' 
],
+   [ 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n" . 'Experimental 
bodyExperimental footer' ],
+   [ 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n" . 
'Experimental bodyExperimental footer' 
]
];
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/295527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I577f5f4027f5a245dd88c2fd3324519ff0d29ccf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixes fail in PHP unit tests runned by CI - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291488

Change subject: Fixes fail in PHP unit tests runned by CI
..

Fixes fail in PHP unit tests runned by CI

Change-Id: Ic606344a21ddd6fdcd74cee11c0487a89b88ddbd
---
M tests/includes/FileProviderTest.php
1 file changed, 22 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/88/291488/1

diff --git a/tests/includes/FileProviderTest.php 
b/tests/includes/FileProviderTest.php
index f298871..d2b7a9c 100644
--- a/tests/includes/FileProviderTest.php
+++ b/tests/includes/FileProviderTest.php
@@ -17,14 +17,26 @@
/**
 * @var FileProvider
 */
-   protected $fileProvider;
+   private $fileProvider;
+
+   /**
+* @var File
+*/
+   private $loremIpsumFile;
+
+   /**
+* @var File
+*/
+   private $testFile;
 
protected function setUp() {
parent::setUp();
 
+   $this->loremIpsumFile = $this->getFileFromName( 
'LoremIpsum.djvu' );
+   $this->testFile = $this->getFileFromName( 'Test.jpg' );
$this->fileProvider = new FileProviderMock( [
-   $this->getFileFromName( 'LoremIpsum.djvu' ),
-   $this->getFileFromName( 'Test.jpg' )
+   $this->loremIpsumFile,
+   $this->testFile
] );
}
 
@@ -46,7 +58,7 @@
return [
[
ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum.djvu' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
];
}
@@ -55,7 +67,7 @@
 * @expectedException \ProofreadPage\FileNotFoundException
 * @dataProvider indexFileNotFoundProvider
 */
-   public function testGetForIndexPageWithFileNotFound( ProofreadIndexPage 
 $index ) {
+   public function testGetForIndexPageWithFileNotFound( ProofreadIndexPage 
$index ) {
$this->fileProvider->getForIndexPage( $index );
}
 
@@ -84,19 +96,19 @@
return [
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu/4' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu/djvu/1' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'Test.jpg' ) ),
-   $this->getFileFromName( 'Test.jpg' )
+   $this->testFile
],
];
}
@@ -105,7 +117,7 @@
 * @expectedException \ProofreadPage\FileNotFoundException
 * @dataProvider pageFileNotFoundProvider
 */
-   public function testGetForPagePageWithFileNotFound( ProofreadPagePage  
$page ) {
+   public function testGetForPagePageWithFileNotFound( ProofreadPagePage 
$page ) {
$this->fileProvider->getForPagePage( $page );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/291488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic606344a21ddd6fdcd74cee11c0487a89b88ddbd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits