From a66fabc04bfba5d9ef5eb8e7ae4933a21b5dbba4 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Thu, 14 Apr 2011 15:56:40 +0000 Subject: [PATCH] Added wrapper mw.api() for API calls --- .../mediawiki.action/mediawiki.action.watch.ajax.js | 5 +---- resources/mediawiki/mediawiki.js | 11 +++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/resources/mediawiki.action/mediawiki.action.watch.ajax.js b/resources/mediawiki.action/mediawiki.action.watch.ajax.js index c0fc40539d..f92f004727 100644 --- a/resources/mediawiki.action/mediawiki.action.watch.ajax.js +++ b/resources/mediawiki.action/mediawiki.action.watch.ajax.js @@ -85,15 +85,12 @@ $( document ).ready( function() { var reqData = { 'action': 'watch', - 'format': 'json', 'title': $link.data( 'target' ) }; if ( $link.data( 'action' ) == 'unwatch' ) { reqData['unwatch'] = ''; } - $.getJSON( mw.config.get( 'wgScriptPath' ) - + '/api' + mw.config.get( 'wgScriptExtension' ), - reqData, + mw.api(reqData, function( data, textStatus, xhr ) { wgAjaxWatch.processResult( data, $link ); } diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index bf81dd7724..8cf2c68c54 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -472,6 +472,17 @@ window.mediaWiki = new ( function( $ ) { return mediaWiki.message.apply( mediaWiki.message, arguments ).toString(); }; + /** + * Performs an API call + * + * @param data object Call parameters + * @param callback function Function to be called on success, see jQuery.getJSON() for details + */ + this.api = function( data, callback ) { + var url = this.config.get( 'wgScriptPath' ) + '/api' + this.config.get( 'wgScriptExtension' ); + data.format = 'json'; + return jQuery.getJSON( url, data, callback ); + } /** * Client-side module loader which integrates with the MediaWiki ResourceLoader */ -- 2.20.1