Revision: 48590
Author: dale
Date: 2009-03-19 18:54:02 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
firefogg updates add msg for unsupported file type
Modified Paths:
--------------
trunk/extensions/MetavidWiki/languages/MV_Messages.php
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
Modified: trunk/extensions/MetavidWiki/languages/MV_Messages.php
===================================================================
--- trunk/extensions/MetavidWiki/languages/MV_Messages.php 2009-03-19
18:26:08 UTC (rev 48589)
+++ trunk/extensions/MetavidWiki/languages/MV_Messages.php 2009-03-19
18:54:02 UTC (rev 48590)
@@ -68,6 +68,7 @@
'upload-select-file' => 'Select file...',
'wgfogg_wrong_version' => "You have Firefogg installed but it is
outdated. <a href=\"http://firefogg.org\";>Please upgrade</a>.",
'wgfogg_waring_ogg_upload' => 'You have selected an .ogg file for
conversion to Ogg (this is probably unnecessary). Maybe disable the video
converter?',
+ 'wgfogg_waring_bad_extension'=> 'You have selected a file with an
unsuported extension. <a
href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types";>More
help</a>',
# remoteSearchDriver.js
#set to ignored for now. Messages does not appear to be final
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
2009-03-19 18:26:08 UTC (rev 48589)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvFirefogg.js
2009-03-19 18:54:02 UTC (rev 48590)
@@ -129,7 +129,7 @@
return false;
}else if( ext == 'avi' || ext == 'mov' || ext
== 'mp4' || ext=='mp2' ||
ext == 'mpeg' || ext ==
'mpeg2' || ext == 'mpeg4' ||
- ext == 'dv' ){
+ ext == 'dv' || ext=='wmv' ){
//hide ogg warning
$j('#wgfogg_waring_ogg_upload').hide();
sf = sf.replace( ext, 'ogg' );
@@ -320,9 +320,16 @@
js_log( 'firefogg:upload done: ');
//if in "post" upload mode read the html response
(should be depricated):
if( _this.upload_mode == 'post' ) {
- var pstatus = JSON.parse(
_this.fogg.uploadstatus() );
+ var response_text ='';
+ try{
+ var pstatus = JSON.parse(
_this.fogg.uploadstatus() );
+ response_text = pstatus["responseText"];
+ }catch(e){
+ js_log("could not parse uploadstatus /
could not get responseText");
+ }
//js_log( 'done upload response is: ' +
cat["responseText"] );
- _this.procPageResponse( pstatus["responseText"]
);
+ _this.procPageResponse( response_text );
+
}else if( _this.upload_mode == 'chunks'){
//should have an json result:
js_error('chunks upload not yet supported');
@@ -360,8 +367,7 @@
_this.upload_done_action();
}
}else{
- //js_log( 'upload page error: did not find: ' +sstring
+ ' in ' + "\n" + result_page );
- var error_txt = 'Unkown error';
+ //js_log( 'upload page error: did not find: ' +sstring
+ ' in ' + "\n" + result_page );
var form_txt = '';
if( !result_page ){
//@@todo fix this:
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
2009-03-19 18:26:08 UTC (rev 48589)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js
2009-03-19 18:54:02 UTC (rev 48590)
@@ -9,9 +9,10 @@
"upload-in-progress":"Doing Transcode & Upload (do not close this
window)",
"upload-transcoded-status": "Transcoded",
"uploaded-status": "Uploaded",
- "upload-select-file": "Select File...",
+ "upload-select-file": "Select File...",
"wgfogg_wrong_version": "You have firefogg installed but its outdated,
<a href=\"http://firefogg.org\";>please upgrade</a> ",
- "wgfogg_waring_ogg_upload": "You have selected an ogg file for
conversion to ogg (this is probably unnessesary). Maybe disable the video
converter?"
+ "wgfogg_waring_ogg_upload": "You have selected an ogg file for
conversion to ogg (this is probably unnessesary). Maybe disable the video
converter?",
+ "wgfogg_waring_bad_extension" : "You have selected a file with an
unsuported extension. <a
href=\"http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types\";>More
help</a>"
});
var default_upload_options = {
@@ -106,13 +107,19 @@
'<input style="display:none"
id="fogg-video-file" name="fogg-video-file" type="button" value="' +
gM('upload-select-file') + '">' +
"<span
id='wgfogg_not_installed'>" +
gM('upload-fogg_not_installed') +
- '</span>' +
- "<span class='error'
id='wgfogg_wrong_version' style='display:none'><br>" +
+ "</span>" +
+ "<span class='error'
id='wgfogg_wrong_version' style='display:none;'><br>" +
gM('wgfogg_wrong_version') +
- '</span>' +
- "<span class='error'
id='wgfogg_waring_ogg_upload' style='display:none' ><br>"+
-
gM('wgfogg_waring_ogg_upload') +
- '</span>' +
+ "<br>" +
+ "</span>" +
+ "<span class='error'
id='wgfogg_waring_ogg_upload' style='display:none;'><br>"+
+
gM('wgfogg_waring_ogg_upload') +
+ "<br>" +
+ "</span>" +
+ "<span class='error'
id='wgfogg_waring_bad_extension' style='display:none;'><br>"+
+
gM('wgfogg_waring_bad_extension') +
+ "<br>" +
+ "</span>" +
"<span id='wgfogg_installed'
style='display:none' >"+
'<input
id="wgEnableFirefogg" type="checkbox" name="wgEnableFirefogg" >' +
gM('upload-enable-converter') +
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js 2009-03-19
18:26:08 UTC (rev 48589)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js 2009-03-19
18:54:02 UTC (rev 48590)
@@ -551,7 +551,7 @@
{
var name_value = pairs[i].split('=');
this.preference[name_value[0]]=name_value[1];
- js_log('load preference for ' + name_value[0] + ' is ' +
name_value[1]);
+ //js_log('load preference for ' + name_value[0] + ' is ' +
name_value[1]);
}
}
},
@@ -569,7 +569,7 @@
function getCookie ( cookieName ) {
var m = document.cookie.match( cookieName + '=(.*?)(;|$)' );
- js_log('getCookie:' + cookieName + ' v:' + (m ? unescape( m[1] ) :
false));
+ //js_log('getCookie:' + cookieName + ' v:' + (m ? unescape( m[1] ) :
false));
return m ? unescape( m[1] ) : false;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
