Revision: 51750
Author: dale
Date: 2009-06-11 18:03:45 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
minor fixes (firefogg, temporal urls)
Modified Paths:
--------------
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
Modified: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
2009-06-11 17:55:44 UTC (rev 51749)
+++ branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
2009-06-11 18:03:45 UTC (rev 51750)
@@ -437,7 +437,7 @@
aReq['ignorewarnings'] =
_this.formData['wpIgnoreWarning'];
js_log('do fogg upload call: '+ _this.api_url + ' :: ' +
JSON.stringify( aReq ) );
-
+ js_log('foggEncode: '+ JSON.stringify( _this.encoder_settings )
);
_this.fogg.upload( JSON.stringify( _this.encoder_settings ),
_this.api_url , JSON.stringify( aReq ) );
//update upload status:
@@ -529,15 +529,14 @@
js_log( 'done upload response is: '
+ cat["responseText"] );
_this.procPageResponse(
response_text );
}else if( _this.upload_mode == 'api'){
- if( _this.fogg.resultUrl ){
+ if( _this.fogg.resultUrl ){
+ var buttons ={};
+
buttons[gM('go-to-resource')] = function(){
+
window.location = _this.fogg.resultUrl;
+ }
var go_to_url_txt =
gM('go-to-resource');
//should have an json result:
- _this.updateProgressWin(
gM('successfulupload'), gM( 'mv_upload_done', _this.fogg.resultUrl),
- {
-
go_to_url_txt:function(){
-
window.location = _this.fogg.resultUrl;
- }
- });
+ _this.updateProgressWin(
gM('successfulupload'), gM( 'mv_upload_done', _this.fogg.resultUrl),buttons);
}else{
//done state with error?
..not really possible given how firefogg works
js_log(" upload done, in
chunks mode, but no resultUrl!");
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-11 17:55:44 UTC (rev 51749)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-11 18:03:45 UTC (rev 51750)
@@ -539,7 +539,7 @@
//should check some other way.
var pUrl = parseUri ( this.src );
if(typeof pUrl['queryKey']['t'] != 'undefined'){
- this['URLTimeEncoding']=true;
+ this['URLTimeEncoding']=true;
}
for(var i=0; i < mv_default_source_attr.length; i++){ //array
loop:
var attr = mv_default_source_attr[ i ];
Modified: branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-11 17:55:44 UTC
(rev 51749)
+++ branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-11 18:03:45 UTC
(rev 51750)
@@ -912,9 +912,7 @@
}else{
seconds = Math.round( seconds );
}
-
- if ( minutes < 10 ) minutes = "0" + minutes;
- if ( seconds < 10 ) seconds = "0" + seconds;
+
return hours+":"+minutes+":"+seconds;
}
/*
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
