http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89315
Revision: 89315
Author: dale
Date: 2011-06-02 01:47:22 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
fixes bug 29185 Adds a separate module "jquery.loadingSpinner" that has a
sprite based png alpha loading animation ( that looks good in on any background
)
*Needs help* on the spinner graphic "loadingDots.png" that does not look like
crap and not made in gimp in a min.
Modified Paths:
--------------
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery/jquery.mwEmbedUtil.js
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/skins/common/MwEmbedCommonStyle.css
trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/tests/Player_Sources.html
Added Paths:
-----------
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/jquery.loadingSpinner.js
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingDots.png
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpinner.css
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpokes.gif
Modified:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
2011-06-02 01:46:27 UTC (rev 89314)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
2011-06-02 01:47:22 UTC (rev 89315)
@@ -9,12 +9,21 @@
'dependencies' => array(
// jQuery dependencies:
'jquery.triggerQueueCallback',
+ 'jquery.loadingSpinner',
'jquery.mwEmbedUtil',
),
'messageFile' => 'MwEmbedSupport.i18n.php',
),
+ "jquery.loadingSpinner" => array(
+ 'scripts' => 'jquery.loadingSpinner/jquery.loadingSpinner.js',
+ 'styles' => 'jquery.loadingSpinner/loadingSpinner.css'
+ ),
'mw.MwEmbedSupport.style' => array(
- 'styles'=>'skins/common/MwEmbedCommonStyle.css',
+ // NOTE we add the loadingSpinner.css as a work around to the
resource loader register
+ // of modules as "ready" even though only the "script" part of
the module was included.
+ 'styles'=> array( 'skins/common/MwEmbedCommonStyle.css',
+
'jquery.loadingSpinner/loadingSpinner.css'
+ ),
'skinStyles' => array(
/* shared jQuery ui skin styles */
'darkness' =>
'skins/jquery.ui.themes/darkness/jquery-ui-1.7.2.css',
Modified:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery/jquery.mwEmbedUtil.js
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery/jquery.mwEmbedUtil.js
2011-06-02 01:46:27 UTC (rev 89314)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery/jquery.mwEmbedUtil.js
2011-06-02 01:47:22 UTC (rev 89315)
@@ -19,46 +19,7 @@
});
}
};
-
- /**
- * Set a given selector html to the loading spinner:
- */
- $.fn.loadingSpinner = function( ) {
- if ( this ) {
- $( this ).html(
- $( '<div />' )
- .addClass( "loadingSpinner" )
- );
- }
- return this;
- };
- /**
- * Add an absolute overlay spinner useful for cases where the
- * element does not display child elements, ( images, video )
- */
- $.fn.getAbsoluteOverlaySpinner = function(){
- var pos = $( this ).offset();
- var posLeft = ( $( this ).width() ) ?
- parseInt( pos.left + ( .5 * $( this ).width() ) -16 ) :
- pos.left + 30;
- var posTop = ( $( this ).height() ) ?
- parseInt( pos.top + ( .5 * $( this ).height() ) -16 ) :
- pos.top + 30;
-
- var $spinner = $('<div />')
- .loadingSpinner()
- .css({
- 'width' : 32,
- 'height' : 32,
- 'position': 'absolute',
- 'top' : posTop + 'px',
- 'left' : posLeft + 'px'
- });
- $('body').append( $spinner );
- return $spinner;
- };
-
/**
* Shortcut to a themed button Should be depreciated for $.button
Added:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/jquery.loadingSpinner.js
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/jquery.loadingSpinner.js
(rev 0)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/jquery.loadingSpinner.js
2011-06-02 01:47:22 UTC (rev 89315)
@@ -0,0 +1,51 @@
+( function( $ ) {
+ /**
+ * Set a given selector html to the loading spinner:
+ */
+ $.fn.loadingSpinner = function( ) {
+ var _this = this;
+ if ( _this ) {
+ $( _this ).html(
+ $( '<div />' )
+ .addClass( "loadingSpinner" )
+ );
+ var i =0;
+ var interval = setInterval( function(){
+ if( _this && $( _this
).find('.loadingSpinner').length ){
+ var offset = i*32;
+ $( _this
).find('.loadingSpinner').css('background-position','0 ' + offset + 'px');
+ if(i >= 7) i = 0;
+ i++;
+ } else {
+ clearInterval( interval );
+ }
+ }, 70 );
+ }
+ return _this;
+ };
+ /**
+ * Add an absolute overlay spinner useful for cases where the
+ * element does not display child elements, ( images, video )
+ */
+ $.fn.getAbsoluteOverlaySpinner = function(){
+ var pos = $( this ).offset();
+ var posLeft = ( $( this ).width() ) ?
+ parseInt( pos.left + ( .5 * $( this ).width() ) -16 ) :
+ pos.left + 30;
+
+ var posTop = ( $( this ).height() ) ?
+ parseInt( pos.top + ( .5 * $( this ).height() ) -16 ) :
+ pos.top + 30;
+
+ var $spinner = $('<div />')
+ .addClass('absoluteOverlaySpinner')
+ .loadingSpinner()
+ .css({
+ 'top' : posTop + 'px',
+ 'left' : posLeft + 'px'
+ });
+ $('body').append( $spinner );
+ return $spinner;
+ };
+
+} )( jQuery );
\ No newline at end of file
Property changes on:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/jquery.loadingSpinner.js
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingDots.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingDots.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpinner.css
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpinner.css
(rev 0)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpinner.css
2011-06-02 01:47:22 UTC (rev 89315)
@@ -0,0 +1,9 @@
+.loadingSpinner {
+ background-image: url('loadingDots.png');
+ width: 32px;
+ height: 32px;
+}
+.absoluteOverlaySpinner {
+ position : absolute;
+ z-index: 3;
+}
\ No newline at end of file
Property changes on:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpinner.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpokes.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/loadingSpokes.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/skins/common/MwEmbedCommonStyle.css
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/skins/common/MwEmbedCommonStyle.css
2011-06-02 01:46:27 UTC (rev 89314)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/skins/common/MwEmbedCommonStyle.css
2011-06-02 01:47:22 UTC (rev 89315)
@@ -14,49 +14,6 @@
color:white;
}
-.loadingSpinner {
- width:32px;
- height:32px;
- display:block;
- padding:0px;
- /* @embed */
- background-image: url(images/loading_ani.gif);
- margin: auto;
-}
-.cssLoadingSpinner {
- position:relative;
- width:100px;
- height:100px;
- //margin:25px;
- -moz-border-radius:100px;
- float:left;
- -moz-transform:scale(0.3);
- -webkit-transform:scale(0.3);
-
- /* not used right now: */
- -webkit-animation-name: rotateThis;
- -webkit-animation-duration:2s;
- -webkit-animation-iteration-count:infinite;
- -webkit-animation-timing-function:linear;
-}
-.cssLoadingSpinner div {
- width:15px;
- height:30px;
- position:absolute;
- top:35px;
- left:45px;
-}
-.cssLoadingSpinner div {
- -moz-border-radius:30px;
- -webkit-border-radius:30px;
- border-radius:30px;
-}
-/* uncomment this to use css animation in webkit browsers */
- @-webkit-keyframes rotateThis {
- from {-webkit-transform:scale(0.7) rotate(0deg);}
- to {-webkit-transform:scale(0.7) rotate(360deg);}
-}
-
/* jquery.ui overrides */
.ui-icon_link {
Modified: trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php
===================================================================
--- trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php 2011-06-02
01:46:27 UTC (rev 89314)
+++ trunk/extensions/MwEmbedSupport/MwEmbedSupport.hooks.php 2011-06-02
01:47:22 UTC (rev 89315)
@@ -43,7 +43,7 @@
// Add MwEmbedSupport modules to Startup:
static function addStartupModules( &$modules ){
- array_push($modules, 'jquery.triggerQueueCallback',
'jquery.mwEmbedUtil', 'mw.MwEmbedSupport' );
+ array_push($modules, 'jquery.triggerQueueCallback',
'jquery.loadingSpinner', 'jquery.mwEmbedUtil', 'mw.MwEmbedSupport' );
return true;
}
}
\ No newline at end of file
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2011-06-02 01:46:27 UTC (rev 89314)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2011-06-02 01:47:22 UTC (rev 89315)
@@ -76,8 +76,7 @@
$( playerElement )
.getAbsoluteOverlaySpinner()
.attr('id', 'loadingSpinner_' + $(
playerElement ).attr('id') )
- .addClass( 'playerLoadingSpinner' );
-
+
// Add core "skin/interface" loader
var skinString = $( playerElement ).attr( 'class' );
if( ! skinString
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/tests/Player_Sources.html
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/tests/Player_Sources.html
2011-06-02 01:46:27 UTC (rev 89314)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/tests/Player_Sources.html
2011-06-02 01:47:22 UTC (rev 89315)
@@ -2,8 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<title>Player sources</title>
-
-<script type="text/javascript" src="../../../mwEmbedLoader.php"></script>
+ <script type="text/javascript"
src="../../../mwEmbedLoader.php"></script>
</head>
<body>
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
