http://www.mediawiki.org/wiki/Special:Code/MediaWiki/92630
Revision: 92630 Author: j Date: 2011-07-20 12:16:24 +0000 (Wed, 20 Jul 2011) Log Message: ----------- fix Firefogg upload. use fileChangedOk Modified Paths: -------------- trunk/extensions/UploadWizard/resources/mw.FirefoggHandler.js trunk/extensions/UploadWizard/resources/mw.FirefoggTransport.js Modified: trunk/extensions/UploadWizard/resources/mw.FirefoggHandler.js =================================================================== --- trunk/extensions/UploadWizard/resources/mw.FirefoggHandler.js 2011-07-20 12:10:44 UTC (rev 92629) +++ trunk/extensions/UploadWizard/resources/mw.FirefoggHandler.js 2011-07-20 12:16:24 UTC (rev 92630) @@ -88,7 +88,9 @@ .val( _this.getFogg().sourceFilename ) //.trigger('change'); // note the change trigger does not work because we replace the target: - _this.upload.ui.fileChanged(); + var title = _this.getTransport().getFileName().replace( /:/g, '_' ); + _this.upload.title = new mw.Title( title , 'file' ); + _this.upload.ui.fileChangedOk(); } } ); }, Modified: trunk/extensions/UploadWizard/resources/mw.FirefoggTransport.js =================================================================== --- trunk/extensions/UploadWizard/resources/mw.FirefoggTransport.js 2011-07-20 12:10:44 UTC (rev 92629) +++ trunk/extensions/UploadWizard/resources/mw.FirefoggTransport.js 2011-07-20 12:16:24 UTC (rev 92630) @@ -98,7 +98,8 @@ return this.fogg.sourceFilename.split('.').slice(0,-1).join('.') + '.oga'; } if( this.isSourceVideo() ){ - return this.fogg.sourceFilename.split('.').slice(0,-1).join('.') + '.webm'; + var ext = this.getEncodeExt(); + return this.fogg.sourceFilename.split('.').slice(0,-1).join('.') + '.' + ext; } } }, _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs