| Index: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.Firefogg.js |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | return this.init( options ); |
| 118 | 118 | }; |
| 119 | 119 | mw.Firefogg.prototype = { // extends mw.BaseUploadInterface |
| 120 | | - min_firefogg_version: '0.9.9.5', |
| | 120 | + min_firefogg_version: '1.1.0', |
| 121 | 121 | default_encoder_settings: { // NOTE: allow the server to set these |
| 122 | 122 | 'maxSize' : '400', |
| 123 | 123 | 'videoBitrate' : '544', |
| — | — | @@ -1150,14 +1150,9 @@ |
| 1151 | 1151 | } |
| 1152 | 1152 | mw.log( 'firefogg:cancel' ) |
| 1153 | 1153 | if ( confirm( gM( 'mwe-cancel-confim' ) ) ) { |
| 1154 | | - // FIXME: sillyness ( upstream firefogg cancel fix needed ) |
| 1155 | | - if ( navigator.oscpu && navigator.oscpu.search( 'Win' ) >= 0 ) { |
| 1156 | | - alert( 'sorry we do not yet support cancel on windows' ); |
| 1157 | | - } else { |
| 1158 | | - this.action_done = true; |
| 1159 | | - this.fogg.cancel(); |
| 1160 | | - $j( dialogElement ).empty().dialog( 'close' ); |
| 1161 | | - } |
| | 1154 | + this.action_done = true; |
| | 1155 | + this.fogg.cancel(); |
| | 1156 | + $j( dialogElement ).empty().dialog( 'close' ); |
| 1162 | 1157 | } |
| 1163 | 1158 | // Don't follow the # link: |
| 1164 | 1159 | return false; |