Merge "mediawiki.special.upload: Use mediawiki.api.parse"

diff --combined resources/src/mediawiki.special/mediawiki.special.upload.js
index b1ef224,0c3eb21..fcd933e
--- 1/resources/src/mediawiki.special/mediawiki.special.upload.js
--- 2/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@@ -61,7 -61,7 +61,7 @@@
  
                timeout: function () {
                        var $spinnerDestCheck, title;
 -                      if ( !ajaxUploadDestCheck || this.nameToCheck === '' ) {
 +                      if ( !ajaxUploadDestCheck || this.nameToCheck.trim() === '' ) {
                                return;
                        }
                        $spinnerDestCheck = $.createSpinner().insertAfter( '#wpDestFile' );
@@@ -71,7 -71,7 +71,7 @@@
                                formatversion: 2,
                                action: 'query',
                                // If title is empty, user input is invalid, the API call will produce details about why
 -                              titles: title ? title.getPrefixedText() : this.nameToCheck,
 +                              titles: [ title ? title.getPrefixedText() : this.nameToCheck ],
                                prop: 'imageinfo',
                                iiprop: 'uploadwarning',
                                errorformat: 'html',
@@@ -134,10 -134,7 +134,7 @@@
  
                        $spinner = $.createSpinner().insertAfter( $element );
  
-                       ( new mw.Api() ).get( {
-                               formatversion: 2,
-                               action: 'parse',
-                               text: '{{' + template + '}}',
+                       ( new mw.Api() ).parse( '{{' + template + '}}', {
                                title: $( '#wpDestFile' ).val() || 'File:Sample.jpg',
                                prop: 'text',
                                pst: true,
@@@ -150,7 -147,7 +147,7 @@@
                },
  
                processResult: function ( result, template, $previewContainer ) {
-                       this.responseCache[ template ] = result.parse.text;
+                       this.responseCache[ template ] = result;
                        this.showPreview( this.responseCache[ template ], $previewContainer );
                },