jenkins-bot has submitted this change and it was merged.
Change subject: Fix collapsing via topics collapsing button
......................................................................
Fix collapsing via topics collapsing button
Filter out appropriate moderated states.
When clicking the collapser button in the top right corner,
previously this would have the effect of breaking the collapse
state of moderated posts (moderated posts would expand)
This rectifies this.
Bug: 68773
Change-Id: I42905bc5cc6623b988b51c5404e5a0564f4d81a0
---
M modules/new/components/flow-board.js
M tests/browser/features/collapse.feature
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index 1d9d4cf..0bbcd03 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -2146,6 +2146,7 @@
flowBoard.$board.find( '.flow-element-expanded,
.flow-element-collapsed' )
// If moderated topics are currently
collapsed, leave them that way
.not(
'.flow-element-moderated.flow-element-collapsed' )
+ .not( '.flow-topic-moderated' )
.removeClass( 'flow-element-expanded
flow-element-collapsed' );
// Remove individual topic states
diff --git a/tests/browser/features/collapse.feature
b/tests/browser/features/collapse.feature
index 926d772..13e50fa 100644
--- a/tests/browser/features/collapse.feature
+++ b/tests/browser/features/collapse.feature
@@ -71,7 +71,6 @@
And I should see who started the first non-moderated topic
And I should see the comments of the first non-moderated topic
- @wip
Scenario: For a moderated post, a mode cycle with no user override keeps it
hidden
Given I am on Flow page
Then I should see a moderated message on the first moderated topic
@@ -97,7 +96,6 @@
And I should not see who started the first moderated topic
And I should not see the comments of the first moderated topic
- @wip
Scenario: For a moderated post, switching modes does not forget a user-set
close override
Given I am on Flow page
# First, erase the server-set close override
--
To view, visit https://gerrit.wikimedia.org/r/150089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42905bc5cc6623b988b51c5404e5a0564f4d81a0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
