jenkins-bot has submitted this change and it was merged.
Change subject: JS load of topic with garbled post breaks board interactivity
......................................................................
JS load of topic with garbled post breaks board interactivity
Haven't tested this but this should work, :)
Bug: 61097
Change-Id: If838e853f46fad724acf42f83b8c810509cb8edb
---
M modules/new/components/flow-board.js
1 file changed, 15 insertions(+), 9 deletions(-)
Approvals:
Matthias Mullie: 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 a845a47..334f262 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -425,15 +425,21 @@
return;
}
- // Render topiclist template
- $target.before(
- $tmp = $(
flowBoard.TemplateEngine.processTemplateGetFragment(
- 'flow_topiclist_loop',
- data.flow[ 'view-topiclist'
].result.topiclist
- ) ).children()
- );
- // Run loadHandlers
- FlowBoardComponent.UI.makeContentInteractive( $tmp );
+ // See bug 61097, Catch any random javascript error from
+ // parsoid so they don't break and stop the page
+ try {
+ // Render topiclist template
+ $target.before(
+ $tmp = $(
flowBoard.TemplateEngine.processTemplateGetFragment(
+ 'flow_topiclist_loop',
+ data.flow[ 'view-topiclist'
].result.topiclist
+ ) ).children()
+ );
+ // Run loadHandlers
+ FlowBoardComponent.UI.makeContentInteractive(
$tmp );
+ } catch( e ) {
+ // nothing to do, just silently ignore the
external error
+ }
// Render load more template
if ( data.flow[
'view-topiclist'].result.topiclist.links.pagination.fwd ) {
--
To view, visit https://gerrit.wikimedia.org/r/155474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If838e853f46fad724acf42f83b8c810509cb8edb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[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
