http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76854
Revision: 76854
Author: hartman
Date: 2010-11-16 23:40:06 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
Follow up to r76689. This reapplies r75471, r75492 and r75592 which were
overwritten.
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerNative.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-11-16 23:36:15 UTC (rev 76853)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-11-16 23:40:06 UTC (rev 76854)
@@ -528,7 +528,7 @@
// Be sure to remove any player loader spinners
$j('.playerLoadingSpinner').remove();
- mw.log( "EmbedPlayer::All on-page players ready run
playerMannager callbacks" );
+ mw.log( "EmbedPlayer::All on-page players ready run
playerManager callbacks" );
// Run queued functions
if( _this.callbackFunctions ) {
while ( _this.callbackFunctions.length ) {
@@ -2259,7 +2259,7 @@
.css( {
'display' : 'none',
'position' : 'absolute',
- 'zindex' : 2,
+ 'z-index' : 2,
'top' : '0px',
'left' : '0px'
})
@@ -2269,7 +2269,7 @@
// once faded in remove org and
rename new:
$j( '#img_thumb_' + _this.id
).remove();
$j( '#new_img_thumb_' +
_this.id ).attr( 'id', 'img_thumb_' + _this.id );
- $j( '#img_thumb_' + _this.id
).css( 'zindex', '1' );
+ $j( '#img_thumb_' + _this.id
).css( 'z-index', '1' );
_this.thumbnail_updating =
false;
// mw.log("done fadding in "+
//
$j('#img_thumb_'+_this.id).attr("src"));
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerNative.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerNative.js
2010-11-16 23:36:15 UTC (rev 76853)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerNative.js
2010-11-16 23:40:06 UTC (rev 76854)
@@ -314,7 +314,13 @@
};
// Assume we will get to add the Listener before the
seek is done
_this.playerElement.addEventListener( 'seeked', once,
false );
- _this.playerElement.currentTime = time;
+ try {
+ _this.playerElement.currentTime = time;
+ } catch (e) {
+ mw.log("Could not seek to this point.
Unbuffered point.");
+ callback();
+ return;
+ }
} else {
if( callbackCount >= 300 ){
mw.log("Error with seek request, media never in
ready state");
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
