http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73360
Revision: 73360
Author: dale
Date: 2010-09-20 07:39:35 +0000 (Mon, 20 Sep 2010)
Log Message:
-----------
* added increased granularity for duration slider
* fixed title key for file names that include ':'
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
2010-09-20 07:26:08 UTC (rev 73359)
+++
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
2010-09-20 07:39:35 UTC (rev 73360)
@@ -376,8 +376,7 @@
// xxx WTF? no idea why
progressbar above is not working
$j("#firefoggProgressbar
.ui-progressbar-value").css('width', Math.round( progress * 10000 ) / 100 +
'%');
},
- 'doneRenderCallback': function( fogg ){
- debugger;
+ 'doneRenderCallback': function( fogg ){
if( localFile ){
$dialog.html(
gM('mwe-sequencer-save_done') );
} else {
@@ -419,7 +418,7 @@
// Parts of this code are replicated in firefogg upload
handler
// xxx should refactor so they share a common handler
if( fogg.status() == 'upload done' ){
- var response_text = fogg.responseText;
+ var response_text = fogg.responseText;
if ( !response_text ) {
try {
var pstatus = JSON.parse(
fogg.uploadstatus() );
@@ -439,6 +438,7 @@
var apiResult = null;
}
}
+
// Check the api response
if ( !apiResult || apiResult.error || (
apiResult.upload &&
( apiResult.upload.result ==
"Failure" || apiResult.upload.error ) ) ) {
@@ -459,8 +459,7 @@
})
},
uploadSuccess: function($dialog, apiResult){
- var _this = this;
- debugger;
+ var _this = this;
// Update the description page:
$dialog.html( gM('mwe-sequencer-publishing-updatepage' ) );
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-20 07:26:08 UTC (rev 73359)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-20 07:39:35 UTC (rev 73360)
@@ -392,7 +392,7 @@
* @return {String}
*/
getVideoFileName: function(){
- return this.getTitleKey().replace( ':', '-') + '.ogv';
+ return this.getTitleKey().replace( /:/g, '-') + '.ogv';
},
// get upload settings runs the callback with the post url and
request data
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
2010-09-20 07:26:08 UTC (rev 73359)
+++ branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
2010-09-20 07:39:35 UTC (rev 73360)
@@ -878,10 +878,10 @@
// Some slider functions
var sliderToTime = function( sliderval ){
- return parseInt( fullClipDuration * (
sliderval / 1000 ) );
+ return parseInt( fullClipDuration * (
sliderval / 100000 ) );
}
var timeToSlider = function( time ){
- return parseInt( ( time /
fullClipDuration ) * 1000 );
+ return parseInt( ( time /
fullClipDuration ) * 100000 );
}
@@ -939,7 +939,7 @@
.slider({
range: true,
min: 0,
- max: 1000,
+ max: 100000,
values: sliderValues,
slide: function(event,
ui) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
