r90081 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r90080‎ | r90081 | r90082 >
Date:20:36, 14 June 2011
Author:dale
Status:deferred
Tags:
Comment:
bug 29185 follow up to r89315#c17554 don't display the loader for firefox video ( it has it own native loading spinner )
Modified paths:
  • /trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js (modified) (history)
  • /trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js (modified) (history)

Diff [purge]

Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
@@ -72,11 +72,12 @@
7373 $( playerElement ).attr( "id", 'v' + ( rewriteElementCount++ ) );
7474 }
7575
76 - // Add an overlay loader
77 - $( playerElement )
78 - .getAbsoluteOverlaySpinner()
79 - .attr('id', 'loadingSpinner_' + $( playerElement ).attr('id') )
80 -
 76+ // Add an overlay loader ( firefox has its own native loader )
 77+ if( !$.browser.mozilla ){
 78+ $( playerElement )
 79+ .getAbsoluteOverlaySpinner()
 80+ .attr('id', 'loadingSpinner_' + $( playerElement ).attr('id') )
 81+ }
8182 // Add core "skin/interface" loader
8283 var skinString = $( playerElement ).attr( 'class' );
8384 if( ! skinString
Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
@@ -358,7 +358,7 @@
359359 } );
360360
361361 // If we don't already have a loadSpiner add one:
362 - if( $('#loadingSpinner_' + playerInterface.id ).length == 0 ){
 362+ if( $('#loadingSpinner_' + playerInterface.id ).length == 0 && !$.browser.mozilla ){
363363 if( playerInterface.useNativePlayerControls() || playerInterface.isPersistentNativePlayer() ) {
364364 var $spinner = $( targetElement )
365365 .getAbsoluteOverlaySpinner();

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r89315fixes bug 29185 Adds a separate module "jquery.loadingSpinner" that has a s...dale01:47, 2 June 2011

Status & tagging log