jenkins-bot has submitted this change and it was merged.
Change subject: Fixing summarize after resolve topic
......................................................................
Fixing summarize after resolve topic
Summarize after resolve was broken by I1f34dbacb5b76bd23e20dc32cd553d30452ac66b
This change queries for the topic, topic summary container, and
topic summary AFTER it has been re-render to make sure we
are not holding on to old jquery references.
Bug: T115337
Change-Id: Id023230406dd146f70a65a17f0d8773461e31ab7
---
M modules/flow-initialize.js
1 file changed, 5 insertions(+), 7 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/flow-initialize.js b/modules/flow-initialize.js
index e1ba8e0..e94e07c 100644
--- a/modules/flow-initialize.js
+++ b/modules/flow-initialize.js
@@ -40,7 +40,6 @@
// flow-board, but we should still replace it
startEditTopicSummary(
false,
- $( '.flow-topic-summary-container' ),
$component.data( 'flow-id' )
);
@@ -458,9 +457,10 @@
event.preventDefault();
} );
- function startEditTopicSummary( isFullBoard, $summaryContainer,
topicId, action ) {
+ function startEditTopicSummary( isFullBoard, topicId, action ) {
var editTopicSummaryWidget,
- $topic = isFullBoard ? $board.find(
'#flow-topic-' + topicId ) : $(),
+ $topic = $( '#flow-topic-' + topicId ),
+ $summaryContainer = $topic.find(
'.flow-topic-summary-container' ),
$topicSummary = $summaryContainer.find(
'.flow-topic-summary' ),
options = {},
pageName = mw.config.get( 'wgPageName' ),
@@ -510,9 +510,8 @@
$board.on( 'click', '.flow-ui-summarize-topic-link', function (
event ) {
var $topic = $( this ).closest( '.flow-topic' ),
- $container = $topic.find(
'.flow-topic-summary-container' ),
topicId = $topic.data( 'flow-id' );
- startEditTopicSummary( true, $container, topicId );
+ startEditTopicSummary( true, topicId );
event.preventDefault();
} );
@@ -520,7 +519,6 @@
var promise,
action = $( this ).data( 'role' ),
$topic = $( this ).closest( '.flow-topic' ),
- $container = $topic.find(
'.flow-topic-summary-container' ),
topicId = $topic.data( 'flow-id' ),
api = new mw.flow.dm.APIHandler();
@@ -544,7 +542,7 @@
skipSummarize = action ===
'unlock' && !summaryContent;
if ( !skipSummarize ) {
- startEditTopicSummary( true,
$container, topicId, action );
+ startEditTopicSummary( true,
topicId, action );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/245900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id023230406dd146f70a65a17f0d8773461e31ab7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
