diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
commit | 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e (patch) | |
tree | af68743f2f4a47d13f2b0eb05f5c4aaf86d8ea37 /resources/mediawiki.api/mediawiki.api.parse.js | |
parent | af4da56f1ad4d3ef7b06557bae365da2ea27a897 (diff) |
Update to MediaWiki 1.22.0
Diffstat (limited to 'resources/mediawiki.api/mediawiki.api.parse.js')
-rw-r--r-- | resources/mediawiki.api/mediawiki.api.parse.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/resources/mediawiki.api/mediawiki.api.parse.js b/resources/mediawiki.api/mediawiki.api.parse.js index ea0388c1..c4d23b82 100644 --- a/resources/mediawiki.api/mediawiki.api.parse.js +++ b/resources/mediawiki.api/mediawiki.api.parse.js @@ -15,13 +15,15 @@ * @return {string} return.done.data Parsed HTML of `wikitext`. */ parse: function ( wikitext, ok, err ) { - var d = $.Deferred(); + var d = $.Deferred(), + apiPromise; + // Backwards compatibility (< MW 1.20) - d.done( ok ); - d.fail( err ); + d.done( ok ).fail( err ); - this.get( { + apiPromise = this.get( { action: 'parse', + contentmodel: 'wikitext', text: wikitext } ) .done( function ( data ) { @@ -31,7 +33,7 @@ } ) .fail( d.reject ); - return d.promise(); + return d.promise( { abort: apiPromise.abort } ); } } ); |