http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62032
Revision: 62032
Author: j
Date: 2010-02-05 16:44:34 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
update Firefogg dependency to 1.1.0, cancel works in windows now, fixes: 21875
Modified Paths:
--------------
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.Firefogg.js
Modified: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.Firefogg.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.Firefogg.js
2010-02-05 16:35:02 UTC (rev 62031)
+++ branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.Firefogg.js
2010-02-05 16:44:34 UTC (rev 62032)
@@ -116,7 +116,7 @@
return this.init( options );
};
mw.Firefogg.prototype = { // extends mw.BaseUploadInterface
- min_firefogg_version: '0.9.9.5',
+ min_firefogg_version: '1.1.0',
default_encoder_settings: { // NOTE: allow the server to set these
'maxSize' : '400',
'videoBitrate' : '544',
@@ -1150,14 +1150,9 @@
}
mw.log( 'firefogg:cancel' )
if ( confirm( gM( 'mwe-cancel-confim' ) ) ) {
- // FIXME: sillyness ( upstream firefogg cancel fix
needed )
- if ( navigator.oscpu && navigator.oscpu.search( 'Win' )
>= 0 ) {
- alert( 'sorry we do not yet support cancel on
windows' );
- } else {
- this.action_done = true;
- this.fogg.cancel();
- $j( dialogElement ).empty().dialog( 'close' );
- }
+ this.action_done = true;
+ this.fogg.cancel();
+ $j( dialogElement ).empty().dialog( 'close' );
}
// Don't follow the # link:
return false;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
