| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.UploadHandler.js |
| — | — | @@ -797,19 +797,20 @@ |
| 798 | 798 | var _this = this; |
| 799 | 799 | // Check if we have a stashed key: |
| 800 | 800 | if ( _this.warnings_sessionkey !== false ) { |
| 801 | | - //set to "loading" |
| | 801 | + |
| | 802 | + // Set to "loading" |
| 802 | 803 | _this.ui.setLoading(); |
| 803 | | - //setup request: |
| | 804 | + |
| | 805 | + // Setup request: |
| 804 | 806 | var request = { |
| 805 | 807 | 'action': 'upload', |
| 806 | 808 | 'sessionkey': _this.warnings_sessionkey, |
| 807 | 809 | 'ignorewarnings': 1, |
| 808 | 810 | 'token' : _this.getToken(), |
| 809 | 811 | 'filename' : _this.getFileName(), |
| 810 | | - 'comment' : $j( this.form ).find( "[name='comment']" ).val() |
| 811 | | - }; |
| | 812 | + 'comment' : _this.getUploadDescription() |
| | 813 | + }; |
| 812 | 814 | |
| 813 | | - |
| 814 | 815 | //run the upload from stash request |
| 815 | 816 | mw.getJSON(_this.apiUrl, request, function( data ) { |
| 816 | 817 | _this.processApiResult( data ); |
| Index: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r114'; |
| | 8 | +var mwRemoteVersion = 'r115'; |
| 9 | 9 | |
| 10 | 10 | // Log the mwRemote version ( will determine what version of js we get ) |
| 11 | 11 | if( window.console ){ |