Merge "Add Special:UserLogin/signup to search suggestions"

diff --git a/resources/src/mediawiki/api/parse.js b/resources/src/mediawiki/api/parse.js
index bc3d44f..49219d7 100644 (file)
--- a/resources/src/mediawiki/api/parse.js
+++ b/resources/src/mediawiki/api/parse.js
@@ -14,6 +14,7 @@
                 */
                parse: function ( wikitext ) {
                        var apiPromise = this.get( {
+                               formatversion: 2,
                                action: 'parse',
                                contentmodel: 'wikitext',
                                text: wikitext
@@ -21,7 +22,7 @@
 
                        return apiPromise
                                .then( function ( data ) {
-                                       return data.parse.text[ '*' ];
+                                       return data.parse.text;
                                } )
                                .promise( { abort: apiPromise.abort } );
                }

diff --git a/resources/src/mediawiki/mediawiki.userSuggest.js b/resources/src/mediawiki/mediawiki.userSuggest.js
index 02a90fc..99e9dbe 100644 (file)
--- a/resources/src/mediawiki/mediawiki.userSuggest.js
+++ b/resources/src/mediawiki/mediawiki.userSuggest.js
@@ -11,6 +11,7 @@
                        api = api || new mw.Api();
 
                        $.data( node, 'request', api.get( {
+                               formatversion: 2,
                                action: 'query',
                                list: 'allusers',
                                // Prefix of list=allusers is case sensitive. Normalise first

diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
index cd0db7c..f2865eb 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
@@ -16,7 +16,7 @@
 
                this.server.respondWith( /action=parse.*&text='''Hello\+world'''/, function ( request ) {
                        request.respond( 200, { 'Content-Type': 'application/json' },
-                               '{ "parse": { "text": { "*": "<p><b>Hello world</b></p>" } } }'
+                               '{ "parse": { "text": "<p><b>Hello world</b></p>" } }'
                        );
                } );