[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Register WikiLove parts of 'ext.pageTriage.views.toolbar' co...

2016-09-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Register WikiLove parts of 'ext.pageTriage.views.toolbar' 
conditionally
..


Register WikiLove parts of 'ext.pageTriage.views.toolbar' conditionally

Register JS and CSS conditionally, only if WikiLove is present.

This ensures that there will never be missing messages registered,
and also fixes a CI error (though for CI we should load WikiLove
anyway).

Bug: T145798
Change-Id: I7c5ee1127963108e97298cc46d59fbac82514f10
---
M PageTriage.hooks.php
M PageTriage.php
2 files changed, 150 insertions(+), 131 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 6e30285..28d7339 100755
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -467,10 +467,12 @@
$wgTalkPageNoteTemplate;
 
// check if WikiLove is enabled
-   if ( !class_exists( 'ApiWikiLove' ) ) {
-   if ( array_key_exists( 'wikiLove', 
$wgPageTriageCurationModules ) ) {
-   unset( $wgPageTriageCurationModules['wikiLove'] 
);
-   }
+   if ( ExtensionRegistry::getInstance()->isLoaded( 'WikiLove' ) ) 
{
+   $wgPageTriageCurationModules['wikiLove'] = [
+   // depends on WikiLove extension
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#WikiLove',
+   'namespace' => [ NS_MAIN, NS_USER ],
+   ];
}
 
$vars['wgPageTriageCurationModules'] = 
$wgPageTriageCurationModules;
@@ -480,6 +482,149 @@
}
 
/**
+* Register modules that depend on other state
+*
+* @param ResourceLoader &$resourceLoader
+* @return bool true
+*/
+   public static function onResourceLoaderRegisterModules( 
&$resourceLoader ) {
+   $template = [
+   'localBasePath' => __DIR__. '/modules',
+   'remoteExtPath' => 'PageTriage/modules'
+   ];
+
+   $module = $template + [
+   'dependencies' => [
+   'mediawiki.jqueryMsg',
+   'ext.pageTriage.models',
+   'ext.pageTriage.util',
+   'jquery.badge',
+   'jquery.ui.button',
+   'jquery.ui.draggable',
+   'jquery.spinner',
+   'jquery.client',
+   'ext.pageTriage.externalTagsOptions',
+   'ext.pageTriage.externalDeletionTagsOptions'
+   ],
+   'scripts' => [
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolView.js', // abstract class 
first
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js', // article 
metadata
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.minimize.js', // minimize
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.tags.js', // tagging
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.mark.js', // mark as reviewed
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.next.js', // next article
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.delete.js', // mark for deletion
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js', // overall 
toolbar view last
+   'external/jquery.effects.core.js',
+   'external/jquery.effects.squish.js',
+   ],
+   'styles' => [
+   'ext.pageTriage.css', // stuff that's shared 
across all views
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolView.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.mark.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.tags.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.delete.css'
+   ],
+   'messages' => [
+   'pagetriage-creation-dateformat',
+   'pagetriage-user-creation-dateformat',
+   'pagetriage-mark-as-reviewed',
+

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Register WikiLove parts of 'ext.pageTriage.views.toolbar' co...

2016-09-15 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review.

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

Change subject: Register WikiLove parts of 'ext.pageTriage.views.toolbar' 
conditionally
..

Register WikiLove parts of 'ext.pageTriage.views.toolbar' conditionally

Register JS and CSS conditionally, only if WikiLove is present.

Bug: T145798
Change-Id: I7c5ee1127963108e97298cc46d59fbac82514f10
---
M PageTriage.hooks.php
M PageTriage.php
2 files changed, 143 insertions(+), 122 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage 
refs/changes/56/310956/1

diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 6e30285..b1cde8b 100755
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -480,6 +480,148 @@
}
 
/**
+* Register modules that depend on other state
+*
+* @param ResourceLoader &$resourceLoader
+* @return bool true
+*/
+   public static function onResourceLoaderRegisterModules( 
&$resourceLoader ) {
+   $template = [
+   'localBasePath' => __DIR__. '/modules',
+   'remoteExtPath' => 'PageTriage/modules'
+   ];
+
+   $module = $template + [
+   'dependencies' => [
+   'mediawiki.jqueryMsg',
+   'ext.pageTriage.models',
+   'ext.pageTriage.util',
+   'jquery.badge',
+   'jquery.ui.button',
+   'jquery.ui.draggable',
+   'jquery.spinner',
+   'jquery.client',
+   'ext.pageTriage.externalTagsOptions',
+   'ext.pageTriage.externalDeletionTagsOptions'
+   ],
+   'scripts' => [
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolView.js', // abstract class 
first
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.js', // article 
metadata
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.minimize.js', // minimize
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.tags.js', // tagging
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.mark.js', // mark as reviewed
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.next.js', // next article
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.delete.js', // mark for deletion
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js', // overall 
toolbar view last
+   'external/jquery.effects.core.js',
+   'external/jquery.effects.squish.js',
+   ],
+   'styles' => [
+   'ext.pageTriage.css', // stuff that's shared 
across all views
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.toolView.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.articleInfo.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.mark.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.tags.css',
+   
'ext.pageTriage.views.toolbar/ext.pageTriage.delete.css'
+   ],
+   'messages' => [
+   'pagetriage-creation-dateformat',
+   'pagetriage-user-creation-dateformat',
+   'pagetriage-mark-as-reviewed',
+   'pagetriage-mark-as-unreviewed',
+   'pagetriage-info-title',
+   'pagetriage-byline',
+   'pagetriage-byline-new-editor',
+   'pagetriage-articleinfo-byline',
+   'pagetriage-articleinfo-byline-new-editor',
+   'pipe-separator',
+   'pagetriage-edits',
+   'pagetriage-editcount',
+   'pagetriage-author-bot',
+   'pagetriage-no-author',
+   'pagetriage-info-problem-header',
+   'pagetriage-info-history-header',
+   'pagetriage-info-history-show-full',
+   'pagetriage-info-help',
+   'pagetriage-info-no-problems',
+   'pagetria