wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-12-01 03:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update watchlist status from API result"

Browse source
This commit is contained in:
jenkins-bot 2020-09-01 00:29:03 +00:00 committed by Gerrit Code Review
parent 240c766768 d664e0dae4
commit 7e069cdb00
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/CommentController.js
View file

@ -307,8 +307,6 @@ CommentController.prototype.save = function ( comment, pageName ) {
} }
return $.Deferred().reject( code, responseData ).promise(); return $.Deferred().reject( code, responseData ).promise();
} ).then( function ( responseData ) { } ).then( function ( responseData ) {
// Pass through watchlist state.
responseData.watchlist = data.watchlist;
controller.update( responseData, comment, pageName, replyWidget ); controller.update( responseData, comment, pageName, replyWidget );
} ); } );
} ); } );

6
modules/controller.js
View file

@ -276,14 +276,16 @@ function update( data, comment, pageName, replyWidget ) {
} ); } );
} }
// Update watch link to match 'watch checkbox' in save dialog.
// User logged in if module loaded. // User logged in if module loaded.
if ( mw.loader.getState( 'mediawiki.page.watch.ajax' ) === 'ready' ) { if ( mw.loader.getState( 'mediawiki.page.watch.ajax' ) === 'ready' ) {
watch = require( 'mediawiki.page.watch.ajax' ); watch = require( 'mediawiki.page.watch.ajax' );
watch.updateWatchLink( watch.updateWatchLink(
// eslint-disable-next-line no-jquery/no-global-selector // eslint-disable-next-line no-jquery/no-global-selector
$( '#ca-watch a, #ca-unwatch a' ), $( '#ca-watch a, #ca-unwatch a' ),
data.watchlist === 'watch' ? 'unwatch' : 'watch' data.watched ? 'unwatch' : 'watch',
'idle',
data.watchlistexpiry
); );
} }