jenkins-bot has submitted this change and it was merged.
Change subject: Only the text should prevent click-through
......................................................................
Only the text should prevent click-through
Attempting to click the area directly to the right of "Comments (7)"
wasn't toggling hidden status like it should. This patch adjust the
specificity of the ignore selectors so it works as expected.
Bug: 57413
Change-Id: Iba6f2351b6e01b2b001ed38adc18a15ea3b85ff4
---
M modules/discussion/ui.js
M templates/topic.html.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Spage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/discussion/ui.js b/modules/discussion/ui.js
index 3c7a5a4..23c19c9 100644
--- a/modules/discussion/ui.js
+++ b/modules/discussion/ui.js
@@ -297,7 +297,7 @@
'.flow-icon-permalink',
'.flow-icon-watchlist',
'.flow-datestamp a',
- '.flow-topic-comments'
+ '.flow-topic-comments-link'
];
if ( $( e.target ).closest( ignore.join( ',' )
).length > 0 ) {
return true;
diff --git a/templates/topic.html.php b/templates/topic.html.php
index b0808cd..f769069 100644
--- a/templates/topic.html.php
+++ b/templates/topic.html.php
@@ -99,7 +99,7 @@
/* Passing no user always gets the
'moderated by Foo' message */
$this->getContent( $root, 'wikitext' )
);
- else:
+ else:
echo Html::element( 'h2', array( 'class' =>
'flow-realtitle' ), $title );
endif ?>
</div>
@@ -177,7 +177,7 @@
<?php echo $this->printParticipants( $root,
$indexParticipants ); ?>
</li>
<li class="flow-topic-comments">
- <a href="#<?php echo 'flow-topic-reply-' .
$topic->getId()->getHex(); ?>" class="flow-reply-link" data-topic-id="<?php
echo $topic->getId()->getHex() ?>">
+ <a href="#<?php echo 'flow-topic-reply-' .
$topic->getId()->getHex(); ?>" class="flow-reply-link flow-topic-comments-link"
data-topic-id="<?php echo $topic->getId()->getHex() ?>">
<?php
// get total number of posts in
topic
// @todo: the number of
comments should not be a part of the link
--
To view, visit https://gerrit.wikimedia.org/r/101435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba6f2351b6e01b2b001ed38adc18a15ea3b85ff4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Spage <sp...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
