r76854 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76853‎ | r76854 | r76855 >
Date:23:40, 16 November 2010
Author:hartman
Status:deferred
Tags:
Comment:
Follow up to r76689. This reapplies r75471, r75492 and r75592 which were overwritten.
Modified paths:
  • /branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js (modified) (history)
  • /branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerNative.js (modified) (history)

Diff [purge]

Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
@@ -528,7 +528,7 @@
529529 // Be sure to remove any player loader spinners
530530 $j('.playerLoadingSpinner').remove();
531531
532 - mw.log( "EmbedPlayer::All on-page players ready run playerMannager callbacks" );
 532+ mw.log( "EmbedPlayer::All on-page players ready run playerManager callbacks" );
533533 // Run queued functions
534534 if( _this.callbackFunctions ) {
535535 while ( _this.callbackFunctions.length ) {
@@ -2259,7 +2259,7 @@
22602260 .css( {
22612261 'display' : 'none',
22622262 'position' : 'absolute',
2263 - 'zindex' : 2,
 2263+ 'z-index' : 2,
22642264 'top' : '0px',
22652265 'left' : '0px'
22662266 })
@@ -2269,7 +2269,7 @@
22702270 // once faded in remove org and rename new:
22712271 $j( '#img_thumb_' + _this.id ).remove();
22722272 $j( '#new_img_thumb_' + _this.id ).attr( 'id', 'img_thumb_' + _this.id );
2273 - $j( '#img_thumb_' + _this.id ).css( 'zindex', '1' );
 2273+ $j( '#img_thumb_' + _this.id ).css( 'z-index', '1' );
22742274 _this.thumbnail_updating = false;
22752275 // mw.log("done fadding in "+
22762276 // $j('#img_thumb_'+_this.id).attr("src"));
Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerNative.js
@@ -314,7 +314,13 @@
315315 };
316316 // Assume we will get to add the Listener before the seek is done
317317 _this.playerElement.addEventListener( 'seeked', once, false );
318 - _this.playerElement.currentTime = time;
 318+ try {
 319+ _this.playerElement.currentTime = time;
 320+ } catch (e) {
 321+ mw.log("Could not seek to this point. Unbuffered point.");
 322+ callback();
 323+ return;
 324+ }
319325 } else {
320326 if( callbackCount >= 300 ){
321327 mw.log("Error with seek request, media never in ready state");

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75471Spelling error in commenthartman20:49, 26 October 2010
r75492zindex -> z-indexhartman00:36, 27 October 2010
r75592Safari <video> cannot seek to unbuffered areas and throws an INDEX_SIZE_ERR D...hartman23:09, 27 October 2010
r76689sync with kaltura svn. Some whitespace fixes scripts may have to be re-run. (...dale17:33, 15 November 2010

Status & tagging log