http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90081
Revision: 90081
Author: dale
Date: 2011-06-14 20:36:13 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
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
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2011-06-14 20:23:27 UTC (rev 90080)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2011-06-14 20:36:13 UTC (rev 90081)
@@ -72,11 +72,12 @@
$( playerElement ).attr( "id", 'v' + (
rewriteElementCount++ ) );
}
- // Add an overlay loader
- $( playerElement )
- .getAbsoluteOverlaySpinner()
- .attr('id', 'loadingSpinner_' + $(
playerElement ).attr('id') )
-
+ // Add an overlay loader ( firefox has its own native
loader )
+ if( !$.browser.mozilla ){
+ $( playerElement )
+ .getAbsoluteOverlaySpinner()
+ .attr('id', 'loadingSpinner_' + $(
playerElement ).attr('id') )
+ }
// Add core "skin/interface" loader
var skinString = $( playerElement ).attr( 'class' );
if( ! skinString
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-06-14 20:23:27 UTC (rev 90080)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-06-14 20:36:13 UTC (rev 90081)
@@ -358,7 +358,7 @@
} );
// If we don't already have a loadSpiner add one:
- if( $('#loadingSpinner_' + playerInterface.id ).length == 0 ){
+ if( $('#loadingSpinner_' + playerInterface.id ).length == 0 &&
!$.browser.mozilla ){
if( playerInterface.useNativePlayerControls() ||
playerInterface.isPersistentNativePlayer() ) {
var $spinner = $( targetElement )
.getAbsoluteOverlaySpinner();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
