http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72944
Revision: 72944 Author: dale Date: 2010-09-14 00:02:05 +0000 (Tue, 14 Sep 2010) Log Message: ----------- temporary turn of transition edit for updated deployment Modified Paths: -------------- branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBuffer.js Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js =================================================================== --- branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js 2010-09-13 23:49:41 UTC (rev 72943) +++ branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js 2010-09-14 00:02:05 UTC (rev 72944) @@ -33,7 +33,7 @@ 'href' : MW_EMBED_LIBRARY_PAGE, // Style icon to be applied 'class' : 'kaltura-icon', - // An icon image url ( should be a 16x16 image or data url ) + // An icon image url ( should be a 12x12 image or data url ) 'iconurl' : false }, Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js =================================================================== --- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js 2010-09-13 23:49:41 UTC (rev 72943) +++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js 2010-09-14 00:02:05 UTC (rev 72944) @@ -42,11 +42,12 @@ 'editWidgets' : ['editTemplate'], 'editableAttributes' : [ 'apititlekey' ], 'contentTypes' : ['mwtemplate'] - }, + } + /*, 'transitions' : { 'editWidgets' : ['editTransitions'], 'contentTypes': ['video', 'img', 'mwtemplate' ] - } + }*/ }, editableAttributes:{ 'clipBegin':{ @@ -364,12 +365,14 @@ 'change': function(){ // parse smil time var time = _this.sequencer.getSmil().parseTime( $j(this).val() ); + // Check if time > clip duration if( time > $j( smilElement ).attr('dur') ){ time = $j( smilElement ).attr('dur'); } if( time < 0 ) time = 0; + // Update the input value $j( this ).val( mw.seconds2npt( time ) ); // Update the smil attribute Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBuffer.js =================================================================== --- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBuffer.js 2010-09-13 23:49:41 UTC (rev 72943) +++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBuffer.js 2010-09-14 00:02:05 UTC (rev 72944) @@ -410,7 +410,7 @@ mediaBufferSeek: function ( smilElement, seekTime, callback ){ var _this = this; - mw.log("SmilBuffer::mediaBufferSeek: " + this.smil.getSmilElementPlayerID( smilElement ) +' time:' + seekTime ); + //mw.log("SmilBuffer::mediaBufferSeek: " + this.smil.getSmilElementPlayerID( smilElement ) +' time:' + seekTime ); // Get the asset target: var assetId = this.smil.getSmilElementPlayerID( smilElement ); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs