[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Add limit via ResourceLoaderGetConfigVars
Jdlrobson has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365420 )
Change subject: Add limit via ResourceLoaderGetConfigVars
..
Add limit via ResourceLoaderGetConfigVars
Using MakeGlobalVariablesScript hook will add config variables to
the HTML meaning cached HTML will not be able to access it leaving
it as undefined. This will mess up any existing caching.
Additional changes:
Because I'm paranoid, make sure that value is never undefined.
Bug: T170648
Change-Id: Icb8e34104c57b1e69b7e035ef89d5b4c3371132f
---
M includes/FooterHooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
2 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
EBernhardson: Verified; Looks good to me, approved
diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index 5023122..9e9185d 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -28,13 +28,6 @@
->makeConfig( 'RelatedArticles' );
$vars['wgRelatedArticles'] = $out->getProperty(
'RelatedArticles' );
- $limit = $config->get( 'RelatedArticlesCardLimit' );
- $vars['wgRelatedArticlesCardLimit'] = $limit;
- if ( $limit < 1 || $limit > 20 ) {
- throw new \RuntimeException(
- 'The value of wgRelatedArticlesCardLimit is not
valid. It should be between 1 and 20.'
- );
- }
$vars['wgRelatedArticlesUseCirrusSearch'] = $config->get(
'RelatedArticlesUseCirrusSearch' );
$vars['wgRelatedArticlesOnlyUseCirrusSearch'] =
$config->get( 'RelatedArticlesOnlyUseCirrusSearch' );
@@ -169,6 +162,14 @@
$config->get( 'RelatedArticlesLoggingBucketSize' );
$vars['wgRelatedArticlesEnabledBucketSize']
= $config->get( 'RelatedArticlesEnabledBucketSize' );
+
+ $limit = $config->get( 'RelatedArticlesCardLimit' );
+ $vars['wgRelatedArticlesCardLimit'] = $limit;
+ if ( $limit < 1 || $limit > 20 ) {
+ throw new \RuntimeException(
+ 'The value of wgRelatedArticlesCardLimit is not
valid. It should be between 1 and 20.'
+ );
+ }
return true;
}
diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index 297d75a..3c1c81e 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -7,7 +7,8 @@
mw.config.get( 'wgRelatedArticlesUseCirrusSearch' ),
mw.config.get( 'wgRelatedArticlesOnlyUseCirrusSearch' )
),
- LIMIT = mw.config.get( 'wgRelatedArticlesCardLimit' ),
+ // Make sure this is never undefined as I'm paranoid
+ LIMIT = mw.config.get( 'wgRelatedArticlesCardLimit', 3 ),
debouncedLoad = $.debounce( 100, function () {
loadRelatedArticles(); // eslint-disable-line
} ),
--
To view, visit https://gerrit.wikimedia.org/r/365420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb8e34104c57b1e69b7e035ef89d5b4c3371132f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Niedzielski
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...RelatedArticles[master]: Add limit via ResourceLoaderGetConfigVars
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365420 )
Change subject: Add limit via ResourceLoaderGetConfigVars
..
Add limit via ResourceLoaderGetConfigVars
Using MakeGlobalVariablesScript hook will add config variables to
the HTML meaning cached HTML will not be able to access it leaving
it as undefined. This will mess up any existing caching.
Additional changes:
Because I'm paranoid, make sure that value is never undefined.
Bug: T170648
Change-Id: Icb8e34104c57b1e69b7e035ef89d5b4c3371132f
---
M includes/FooterHooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
2 files changed, 10 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles
refs/changes/20/365420/1
diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index 5023122..9e9185d 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -28,13 +28,6 @@
->makeConfig( 'RelatedArticles' );
$vars['wgRelatedArticles'] = $out->getProperty(
'RelatedArticles' );
- $limit = $config->get( 'RelatedArticlesCardLimit' );
- $vars['wgRelatedArticlesCardLimit'] = $limit;
- if ( $limit < 1 || $limit > 20 ) {
- throw new \RuntimeException(
- 'The value of wgRelatedArticlesCardLimit is not
valid. It should be between 1 and 20.'
- );
- }
$vars['wgRelatedArticlesUseCirrusSearch'] = $config->get(
'RelatedArticlesUseCirrusSearch' );
$vars['wgRelatedArticlesOnlyUseCirrusSearch'] =
$config->get( 'RelatedArticlesOnlyUseCirrusSearch' );
@@ -169,6 +162,14 @@
$config->get( 'RelatedArticlesLoggingBucketSize' );
$vars['wgRelatedArticlesEnabledBucketSize']
= $config->get( 'RelatedArticlesEnabledBucketSize' );
+
+ $limit = $config->get( 'RelatedArticlesCardLimit' );
+ $vars['wgRelatedArticlesCardLimit'] = $limit;
+ if ( $limit < 1 || $limit > 20 ) {
+ throw new \RuntimeException(
+ 'The value of wgRelatedArticlesCardLimit is not
valid. It should be between 1 and 20.'
+ );
+ }
return true;
}
diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index 297d75a..3c1c81e 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -7,7 +7,8 @@
mw.config.get( 'wgRelatedArticlesUseCirrusSearch' ),
mw.config.get( 'wgRelatedArticlesOnlyUseCirrusSearch' )
),
- LIMIT = mw.config.get( 'wgRelatedArticlesCardLimit' ),
+ // Make sure this is never undefined as I'm paranoid
+ LIMIT = mw.config.get( 'wgRelatedArticlesCardLimit', 3 ),
debouncedLoad = $.debounce( 100, function () {
loadRelatedArticles(); // eslint-disable-line
} ),
--
To view, visit https://gerrit.wikimedia.org/r/365420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb8e34104c57b1e69b7e035ef89d5b4c3371132f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
