Revision: 52031
Author: dale
Date: 2009-06-17 09:22:54 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
more remote usage fixes
Modified Paths:
--------------
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
branches/new-upload/phase3/js2/uploadPage.js
Modified: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
2009-06-17 09:06:12 UTC (rev 52030)
+++ branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
2009-06-17 09:22:54 UTC (rev 52031)
@@ -320,14 +320,15 @@
js_log(" should update: " +
_this.target_input_file_name + ' to: ' + _this.fogg.sourceFilename );
$j(_this.target_input_file_name).val(_this.fogg.sourceFilename).show();
- if(_this.new_source_cb){
+ if(_this.new_source_cb){
var oggExt =
(_this.isSourceAudio())?'oga':'ogg';
oggExt = (_this.isSourceVideo())?'ogv':oggExt;
+ oggExt = (_this.isUnknown())?'ogg':oggExt;
oggName =
_this.fogg.sourceFilename.substr(0,
_this.fogg.sourceFilename.lastIndexOf('.'));
_this.new_source_cb(
_this.fogg.sourceFilename , oggName +'.'+ oggExt);
- }
+ }
}
}else{
//js_error("Firefogg error selecting file");
@@ -368,14 +369,18 @@
js_log('base autoEncoderSettings::' +
_this.sourceFileInfo.contentType + ' passthrough:' +
_this.encoder_settings['passthrough']);
},
+ isUnknown:function(){
+ return (this.sourceFileInfo.contentType.indexOf("unknown") !=
-1);
+ },
isSourceAudio:function(){
return (this.sourceFileInfo.contentType.indexOf("audio/") != -1);
},
isSourceVideo:function(){
return (this.sourceFileInfo.contentType.indexOf("video/") != -1);
- },
+ },
isOggFormat:function(){
- return ( this.sourceFileInfo.contentType.indexOf("video/ogg") !=
-1);
+ return ( this.sourceFileInfo.contentType.indexOf("video/ogg") != -1
||
+
this.sourceFileInfo.contentType.indexOf("application/ogg") != -1 );
},
getProgressTitle:function(){
js_log("fogg:getProgressTitle f:" + this.fogg_enabled + ' rw:'
+ this.form_rewrite);
Modified:
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
2009-06-17 09:06:12 UTC (rev 52030)
+++ branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
2009-06-17 09:22:54 UTC (rev 52031)
@@ -1512,7 +1512,7 @@
//update if its video or audio:
if( rObj.mime.indexOf('audio')!=-1 ||
rObj.mime.indexOf('video')!=-1 ||
- rObj.mime.indexOf('/ogg')){
+ rObj.mime.indexOf('/ogg') !=-1){
mvJsLoader.embedVideoCheck(function(){
mv_video_embed();
});
Modified: branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
2009-06-17 09:06:12 UTC (rev 52030)
+++ branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
2009-06-17 09:22:54 UTC (rev 52031)
@@ -686,6 +686,11 @@
background-image: url('images/pbar-ani.gif');
}
+ui-widget-overlay{
+ background: url("images/ui-bg_diagonals-thick_20_666666_40x40.png")
repeat scroll 50% 50% #666666;
+ opacity:0.5;
+}
+
/* Vertical Tabs
----------------------------------*/
.ui-dialog-buttonpane { padding:10px !important; }
@@ -748,3 +753,4 @@
-webkit-border-radius: 3px;
}
+
Modified: branches/new-upload/phase3/js2/uploadPage.js
===================================================================
--- branches/new-upload/phase3/js2/uploadPage.js 2009-06-17 09:06:12 UTC
(rev 52030)
+++ branches/new-upload/phase3/js2/uploadPage.js 2009-06-17 09:22:54 UTC
(rev 52031)
@@ -9,6 +9,10 @@
var mwUploadHelper = {
init:function(){
var _this = this;
+ //if not boolean false set to true:
+ if(typeof wgEnableFirefogg == 'undefined')
+ wgEnableFirefogg = true;
+
if( wgEnableFirefogg ){
//setup the upload handler to firefogg (supports our
upload proccess) (should work with the http uploads too)
$j('#wpUploadFile').firefogg({
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
