Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 0 insertions, 45 deletions

diff --git a/resources/mediawiki.api/mediawiki.api.parse.js b/resources/mediawiki.api/mediawiki.api.parse.js
deleted file mode 100644
index c4d23b82..00000000
--- a/resources/mediawiki.api/mediawiki.api.parse.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @class mw.Api.plugin.parse
- */
-( function ( mw, $ ) {
-
-	$.extend( mw.Api.prototype, {
-		/**
-		 * Convinience method for 'action=parse'.
-		 *
-		 * @param {string} wikitext
-		 * @param {Function} [ok] Success callback (deprecated)
-		 * @param {Function} [err] Error callback (deprecated)
-		 * @return {jQuery.Promise}
-		 * @return {Function} return.done
-		 * @return {string} return.done.data Parsed HTML of `wikitext`.
-		 */
-		parse: function ( wikitext, ok, err ) {
-			var d = $.Deferred(),
-				apiPromise;
-
-			// Backwards compatibility (< MW 1.20)
-			d.done( ok ).fail( err );
-
-			apiPromise = this.get( {
-					action: 'parse',
-					contentmodel: 'wikitext',
-					text: wikitext
-				} )
-				.done( function ( data ) {
-					if ( data.parse && data.parse.text && data.parse.text['*'] ) {
-						d.resolve( data.parse.text['*'] );
-					}
-				} )
-				.fail( d.reject );
-
-			return d.promise( { abort: apiPromise.abort } );
-		}
-	} );
-
-	/**
-	 * @class mw.Api
-	 * @mixins mw.Api.plugin.parse
-	 */
-
-}( mediaWiki, jQuery ) );