| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.Firefogg.js |
| — | — | @@ -898,7 +898,7 @@ |
| 899 | 899 | function /* onDone */ () { |
| 900 | 900 | mw.log( 'done with encoding do POST upload:' + _this.form.action ); |
| 901 | 901 | |
| 902 | | - var uploadRequest = _this.getUploadApiRequest(); |
| | 902 | + var uploadRequest = _this.getUploadApiRequest(); |
| 903 | 903 | _this.fogg.post( _this.api_url, 'file', JSON.stringify( uploadRequest ) ); |
| 904 | 904 | |
| 905 | 905 | _this.doUploadStatus(); |
| — | — | @@ -980,7 +980,7 @@ |
| 981 | 981 | mw.log( 'do fogg upload/encode call: ' + _this.api_url + ' :: ' + JSON.stringify( uploadRequest ) ); |
| 982 | 982 | mw.log( 'foggEncode: ' + JSON.stringify( encoderSettings ) ); |
| 983 | 983 | _this.fogg.upload( JSON.stringify( encoderSettings ), _this.api_url, |
| 984 | | - JSON.stringify( aReq ) ); |
| | 984 | + JSON.stringify( uploadRequest ) ); |
| 985 | 985 | |
| 986 | 986 | // Start polling the upload status |
| 987 | 987 | _this.doUploadStatus(); |
| — | — | @@ -1089,7 +1089,7 @@ |
| 1090 | 1090 | _this.renderPreview(); |
| 1091 | 1091 | } |
| 1092 | 1092 | } |
| 1093 | | - mw.log("update progress: " + _this.fogg.progress() + ' state: ' + _this.fogg.state ); |
| | 1093 | + //mw.log("update progress: " + _this.fogg.progress() + ' state: ' + _this.fogg.state ); |
| 1094 | 1094 | // Update the progress bar |
| 1095 | 1095 | _this.updateProgress( _this.fogg.progress() ); |
| 1096 | 1096 | |
| 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 = 'r90'; |
| | 8 | +var mwRemoteVersion = 'r91'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Log the mwRemote version ( will determine what version of js we get ) |