Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265474
Change subject: [Task] Expand in other languages box by default
......................................................................
[Task] Expand in other languages box by default
Bug: T92387
Change-Id: I37aed5d58dc57ce174b145fe3e7c3394d8fa1afa
---
M view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
M view/src/EntityViewPlaceholderExpander.php
2 files changed, 24 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/74/265474/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
index 22ff016..a762fa9 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
@@ -231,7 +231,8 @@
.text( mw.msg(
'wikibase-entitytermsview-entitytermsforlanguagelistview-toggler' ) )
.toggler( {
$subject:
this.$entitytermsforlanguagelistviewContainer,
- duration: 'fast'
+ duration: 'fast',
+ visible: true
} )
.on( 'toggleranimation.' + this.widgetName, function(
event, params ) {
if ( mw.user.isAnon() ) {
diff --git a/view/src/EntityViewPlaceholderExpander.php
b/view/src/EntityViewPlaceholderExpander.php
index 1c49f1c..eafe7ad 100644
--- a/view/src/EntityViewPlaceholderExpander.php
+++ b/view/src/EntityViewPlaceholderExpander.php
@@ -195,7 +195,7 @@
* Dispatch the expansion of placeholders based on the name.
*
* @note This encodes knowledge about which placeholders are used by
EntityView with what
- * intended meaning.
+ * intended meaning.
*
* @param string $name
* @param array $args
@@ -211,16 +211,7 @@
isset( $args[1] ) ? (int)$args[1] : 0
);
case
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class':
- return
- !$this->user->isAnon()
- && $this->user->getBoolOption(
-
'wikibase-entitytermsview-showEntitytermslistview'
- )
- || $this->user->isAnon()
- && isset(
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] )
- &&
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] === 'true'
- ? '' : 'wikibase-initially-collapsed';
-
+ return $this->isInitiallyCollapsed() ?
'wikibase-initially-collapsed' : '';
default:
wfWarn( "Unknown placeholder: $name" );
return '(((' . htmlspecialchars( $name ) .
')))';
@@ -228,6 +219,26 @@
}
/**
+ * Checks if is initially collapsed for current user
+ * @return bool
+ */
+ private function isInitiallyCollapsed() {
+
+ if( $this->user->isAnon()
+ && ( isset(
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] )
+ &&
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] === 'false' ) ){
+ return true;
+ }
+
+ if ( !$this->user->isAnon()
+ && !$this->user->getBoolOption(
'wikibase-entitytermsview-showEntitytermslistview' ) ){
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
* Generates HTML of the term box, to be injected into the entity page.
*
* @param EntityId $entityId
--
To view, visit https://gerrit.wikimedia.org/r/265474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37aed5d58dc57ce174b145fe3e7c3394d8fa1afa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
