From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sun, 17 Apr 2011 05:46:41 +0000 (+0000)
Subject: Back out r86054 and part of r86059 for now, I'd like to evaluate the possibility... 
X-Git-Tag: 1.31.0-rc.0~30761
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=9b1d54fc70bff8f2f5b0379c9764dcafb0563ff1;p=lhc%2Fweb%2Fwiklou.git

Back out r86054 and part of r86059 for now, I'd like to evaluate the possibility of integrating NeilK's work into the core now
---

diff --git a/resources/mediawiki.action/mediawiki.action.watch.ajax.js b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
index f92f004727..c0fc40539d 100644
--- a/resources/mediawiki.action/mediawiki.action.watch.ajax.js
+++ b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
@@ -85,12 +85,15 @@ $( document ).ready( function() {
 		
 		var reqData = {
 			'action': 'watch',
+			'format': 'json',
 			'title': $link.data( 'target' )
 		};
 		if ( $link.data( 'action' ) == 'unwatch' ) {
 			reqData['unwatch'] = '';
 		}
-		mw.api(reqData,
+		$.getJSON( mw.config.get( 'wgScriptPath' )
+				+ '/api' + mw.config.get( 'wgScriptExtension' ),
+			reqData,
 			function( data, textStatus, xhr ) {
 				wgAjaxWatch.processResult( data, $link );
 			}
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 8cf2c68c54..bf81dd7724 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -472,17 +472,6 @@ 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
 	 */