http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73357
Revision: 73357
Author: dale
Date: 2010-09-20 06:20:39 +0000 (Mon, 20 Sep 2010)
Log Message:
-----------
fixed resize keep aspect and include player control bar in interface resize
request
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
branches/MwEmbedStandAlone/modules/Sequencer/loader.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerPlayer.js
Removed Paths:
-------------
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-20 04:59:32 UTC (rev 73356)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-20 06:20:39 UTC (rev 73357)
@@ -1548,13 +1548,20 @@
* Resize the player to a new size
*/
resizePlayer: function( size , animate){
+ mw.log("EmbedPlayer::resizePlayer:" + size.width + ' x ' +
size.height );
this.width = size.width;
this.height = size.height;
+ var playerSize = {'width' : this.width, 'height' : this.height
};
+ // check if height needs to include interface contorls
+ if( ! this.controlBuilder.checkOverlayControls() ){
+ size.height = size.height + this.controlBuilder.height;
+ }
+
if( animate ){
- $j(this).animate(size);
+ $j(this).animate(playerSize);
this.$interface.animate( size );
}else{
- $j(this).css(size);
+ $j(this).css(playerSize);
this.$interface.css( size );
}
},
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
2010-09-20 04:59:32 UTC (rev 73356)
+++
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
2010-09-20 06:20:39 UTC (rev 73357)
@@ -291,17 +291,17 @@
// Check if the published version is already the latest
_this.sequencer.getServer().isPublished( function( isPublished
){
- if( !isPublished ){
- mw.load(
['AddMedia.firefogg','FirefoggRender'], function(){
- _this.doPublish( $dialog )
- });
- } else {
+ if( isPublished ){
$dialog.empty().text(
gM('mwe-sequencer-already-published') )
var buttons = {};
buttons[ gM('mwe-ok') ] = function(){
$j( this ).dialog( 'close' );
}
$dialog.dialog( 'option', 'buttons', buttons);
+ } else {
+ mw.load(
['AddMedia.firefogg','FirefoggRender'], function(){
+ _this.doPublish( $dialog, false )
+ });
}
});
},
@@ -377,6 +377,7 @@
$j("#firefoggProgressbar
.ui-progressbar-value").css('width', Math.round( progress * 10000 ) / 100 +
'%');
},
'doneRenderCallback': function( fogg ){
+ debugger;
if( localFile ){
$dialog.html(
gM('mwe-sequencer-save_done') );
} else {
@@ -459,6 +460,7 @@
},
uploadSuccess: function($dialog, apiResult){
var _this = this;
+ debugger;
// Update the description page:
$dialog.html( gM('mwe-sequencer-publishing-updatepage' ) );
Modified: branches/MwEmbedStandAlone/modules/Sequencer/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/loader.js 2010-09-20
04:59:32 UTC (rev 73356)
+++ branches/MwEmbedStandAlone/modules/Sequencer/loader.js 2010-09-20
06:20:39 UTC (rev 73357)
@@ -31,10 +31,8 @@
"mw.SequencerActionsEdit" :
"actions/mw.SequencerActionsEdit.js",
"$j.fn.jPicker" : "tools/jPicker/jpicker-1.1.5.js",
- "mw.style.jPicker" : "tools/jPicker/css/jPicker-1.1.5.css",
+ "mw.style.jPicker" : "tools/jPicker/css/jPicker-1.1.5.css",
- "mw.SequencerRender" : "mw.SequencerRender.js",
-
"mw.FirefoggRender" : "mw.FirefoggRender.js",
"$j.fn.layout" : "ui.layout/ui.layout-1.2.0.js",
@@ -70,8 +68,7 @@
'mw.SequencerServer',
'mw.SequencerAddByUri',
'mw.SequencerAddMedia',
- 'mw.SequencerPlayer',
- 'mw.SequencerRender',
+ 'mw.SequencerPlayer',
'mw.SequencerTimeline',
'mw.SequencerKeyBindings',
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-20 04:59:32 UTC (rev 73356)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-20 06:20:39 UTC (rev 73357)
@@ -177,7 +177,7 @@
// Don't block on render
setTimeout( function(){
_this.doNextFrame();
- }, 10 );
+ }, 2 );
}
}, true /* hide the buffer overlay */ );
},
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-09-20 04:59:32 UTC (rev 73356)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
2010-09-20 06:20:39 UTC (rev 73357)
@@ -261,12 +261,6 @@
}
return this.actionsEdit;
},
- getRender: function(){
- if( !this.render ){
- this.render = new mw.SequencerRender( this );
- }
- return this.render;
- },
getEmbedPlayer:function(){
return this.getPlayer().getEmbedPlayer();
},
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerPlayer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerPlayer.js
2010-09-20 04:59:32 UTC (rev 73356)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerPlayer.js
2010-09-20 06:20:39 UTC (rev 73357)
@@ -91,19 +91,15 @@
getPlayerSize: function(){
var size = {};
var $playerContainer =
this.sequencer.getContainer().find('.mwseq-player');
- size.width = $playerContainer.width();
- if( this.sequencer.options.videoAspect ){
- var aspect = this.sequencer.options.videoAspect.split(
':' );
- var apectRatio = ( aspect[1] / aspect[0] );
- size.height = parseInt( size.width * ( aspect[1] /
aspect[0] ) )- 55;
- } else {
- size.height = $playerContainer.height() ;
- }
- // Check if we exceeded the max height
- if( size.height > $playerContainer.height() ){
- size.height = $playerContainer.height();
- size.width = parseInt( size.height * ( aspect[0] /
aspect[1] ) );
- }
+
+ var aspect = this.sequencer.options.videoAspect.split( ':' );
+ size.width = $playerContainer.width() - 8;
+ size.height = parseInt( size.width * ( aspect[1] / aspect[0] )
);
+
+ if( size.height > $playerContainer.height() - 35 ){
+ size.height = $playerContainer.height()- 35
+ size.width = parseInt( size.height * ( aspect[0] /
aspect[1] ) );
+ }
return size;
},
Deleted: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
2010-09-20 04:59:32 UTC (rev 73356)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
2010-09-20 06:20:39 UTC (rev 73357)
@@ -1,65 +0,0 @@
-mw.SequencerRender = function( sequenceror ) {
- return this.init( sequenceror );
-};
-
-mw.SequencerRender.prototype = {
- init: function( sequenceror ){
- this.sequenceror = sequenceror;
- },
-
- renderDialog: function(){
- var _this = this;
-
- var $renderDialog = mw.addDialog( {
- 'title' : gM('mwe-sequencer-render-sequence'),
- 'content' : $j('<div />').loadingSpinner()
- } )
-
- mw.load( ['AddMedia.firefogg','mw.FirefoggRender'], function(){
- $renderDialog
- .append(
- _this.getEmbedVideoRender()
- )
- });
- },
-
- getEmbedVideoRender: function(){
- var _this = this;
- var $video = $j('<video />').css({
- 'width': 400,
- 'height': 300
- }).attr({
- 'id' : 'firefoggRenderVideo',
- 'type' : 'application/smil',
- 'src' : _this.sequenceror.getSmilSource()
- })
- // Set the title key if we have it
- if( _this.sequencer.getServer().getTitleKey() ){
- $video.attr('apiTitleKey',
_this.sequencer.getServer().getTitleKey() );
- }
- return $video.embedPlayer(function(){
- // status area
- $j('#firefoggRenderVideo').after(
- $j('<div />').attr('id', 'targetFoggStatus')
- )
-
- // update the player smil to the latest from the editor
- $j('#firefoggRenderVideo').smil.$dom =
_this.sequenceror.smil.$dom;
- // refresh the duration
- $j('#firefoggRenderVideo').getDuration( true );
-
- // Setup the render
- var foggRender =
$j('#firefoggRenderVideo').firefoggRender({
- 'statusTarget': '#targetFoggStatus'
- });
- if( foggRender.doRender() ){
- // stop render button
- $j('#firefoggRenderVideo').after(
- $j('<div />').text('Stop
Render').unbind().click(function(){
- foggRender.stopRender();
- })
- )
- }
- })
- }
-};
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
