From: Tim Eulitz Date: Tue, 26 Mar 2019 15:18:54 +0000 (+0100) Subject: Remove unused rollback module X-Git-Tag: 1.34.0-rc.0~2316^2 X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=1396b67813d141b644f25556ca73a7c65ffd7ad7;p=lhc%2Fweb%2Fwiklou.git Remove unused rollback module The mediawiki.page.rollback module was previously introduced in this patch: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/242050 However, the change was reverted soon after and this module alongside its JavaScript were left in the code, even though they are not used and have been replaced by the mediawiki.page.rollback.confirmation module. Bug: T218574 Change-Id: I2c71adcfcf86e5032e82c237760a9d85a63de3f8 --- diff --git a/resources/Resources.php b/resources/Resources.php index 23b0baf112..718cd839cf 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1766,19 +1766,6 @@ return [ 'removedwatchtext-talk', ], ], - 'mediawiki.page.rollback' => [ - 'scripts' => 'resources/src/mediawiki.page.rollback.js', - 'dependencies' => [ - 'mediawiki.api', - 'mediawiki.notify', - 'mediawiki.util', - 'jquery.spinner', - ], - 'messages' => [ - 'rollbackfailed', - 'actioncomplete', - ], - ], 'mediawiki.page.rollback.confirmation' => [ 'scripts' => 'resources/src/mediawiki.rollback.confirmation.js', 'dependencies' => [ diff --git a/resources/src/mediawiki.page.rollback.js b/resources/src/mediawiki.page.rollback.js deleted file mode 100644 index 2896f40447..0000000000 --- a/resources/src/mediawiki.page.rollback.js +++ /dev/null @@ -1,67 +0,0 @@ -/*! - * Enhance rollback links by using asynchronous API requests, - * rather than navigating to an action page. - * - * @since 1.28 - * @author Timo Tijhof - */ -( function () { - - $( function () { - $( '.mw-rollback-link' ).on( 'click', 'a[data-mw="interface"]', function ( e ) { - var api, $spinner, - $link = $( this ), - url = this.href, - page = mw.util.getParamValue( 'title', url ), - user = mw.util.getParamValue( 'from', url ); - - if ( !page || user === null ) { - // Let native browsing handle the link - return true; - } - - // Preload the notification module for mw.notify - mw.loader.load( 'mediawiki.notification' ); - - // Remove event handler so that next click (re-try) uses server action - $( e.delegateTarget ).off( 'click' ); - - // Hide the link and create a spinner to show it inside the brackets. - $spinner = $.createSpinner( { size: 'small', type: 'inline' } ); - $link.hide().after( $spinner ); - - // @todo: data.messageHtml is no more. Convert to using errorformat=html. - api = new mw.Api(); - api.rollback( page, user ) - .then( function ( data ) { - mw.notify( $.parseHTML( data.messageHtml ), { - title: mw.msg( 'actioncomplete' ) - } ); - - // Remove link container and the subsequent text node containing " | ". - if ( e.delegateTarget.nextSibling && e.delegateTarget.nextSibling.nodeType === Node.TEXT_NODE ) { - $( e.delegateTarget.nextSibling ).remove(); - } - $( e.delegateTarget ).remove(); - }, function ( errorCode, data ) { - var message = data && data.error && data.error.messageHtml ? - $.parseHTML( data.error.messageHtml ) : - mw.msg( 'rollbackfailed' ), - type = errorCode === 'alreadyrolled' ? 'warn' : 'error'; - - mw.notify( message, { - type: type, - title: mw.msg( 'rollbackfailed' ), - autoHide: false - } ); - - // Restore the link (enables user to try again) - $spinner.remove(); - $link.show(); - } ); - - e.preventDefault(); - } ); - } ); - -}() );