John Erling Blad has submitted this change and it was merged.
Change subject: Finally make wbclient.linkItem non-experimental
......................................................................
Finally make wbclient.linkItem non-experimental
Patchset 2: Rebased
Patchset 3: Sporious lines commented out
Change-Id: Ibcab6cfd32bbff82900fcc05edeedc63635fbd71
---
M client/WikibaseClient.hooks.php
M client/config/WikibaseClient.experimental.php
2 files changed, 8 insertions(+), 16 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index c466e25..1396a58 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -609,6 +609,8 @@
// Needed as we can't do that in the regular
CSS nor in JavaScript
// (as that only runs after the element
initially appeared).
$out->addModules( 'wikibase.client.nolanglinks'
);
+ // Add the JavaScript to link pages locally
+ $out->addModules( 'wbclient.linkItem' );
}
}
diff --git a/client/config/WikibaseClient.experimental.php
b/client/config/WikibaseClient.experimental.php
index e3844c3..4646a00 100644
--- a/client/config/WikibaseClient.experimental.php
+++ b/client/config/WikibaseClient.experimental.php
@@ -36,19 +36,9 @@
// includes/parserhooks
$wgAutoloadClasses['Wikibase\PropertyParserFunction'] = $dir .
'includes/parserhooks/PropertyParserFunction.php';
-// Add the JavaScript to link items locally
-$wgHooks['BeforePageDisplay'][] = function( OutputPage &$out, Skin &$skin ) {
- $title = $out->getTitle();
- $namespaceChecker = new \Wikibase\NamespaceChecker(
- \Wikibase\Settings::get( 'excludeNamespaces' ),
- \Wikibase\Settings::get( 'namespaces' )
- );
-
- if ( $namespaceChecker->isWikibaseEnabled( $title->getNamespace() ) ) {
- if ( !$out->getLanguageLinks() && \Action::getActionName(
$skin->getContext() ) === 'view' && $title->exists() ) {
- $out->addModules( 'wbclient.linkItem' );
- }
- }
-
- return true;
-};
+// Sporious code from a merge conflict, but should probably be left in due to
line above
+//$wgHooks['ParserFirstCallInit'][] = function( \Parser &$parser ) {
+// $parser->setFunctionHook( 'property', array(
'\Wikibase\PropertyParserFunction', 'render' ) );
+//
+// return true;
+//};
--
To view, visit https://gerrit.wikimedia.org/r/53606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcab6cfd32bbff82900fcc05edeedc63635fbd71
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: John Erling Blad <john.b...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
