Index: branches/MwEmbedStandAlone/mwEmbed.js |
— | — | @@ -2123,13 +2123,39 @@ |
2124 | 2124 | */ |
2125 | 2125 | $.fn.loadingSpinner = function( ) { |
2126 | 2126 | if ( this ) { |
2127 | | - $j( this ).html( |
2128 | | - $j( '<div />' ) |
2129 | | - .addClass( "loadingSpinner" ) |
2130 | | - ); |
2131 | | - } |
| 2127 | + var csstransforms = false; |
| 2128 | + if ( csstransforms ) { |
| 2129 | + var barNumber = 7; |
| 2130 | + var barContent = ''; |
| 2131 | + var barSpacingDegrees = 360 / barNumber; |
| 2132 | + var barOpacityDelta = 1 / (barNumber) |
| 2133 | + for (i = 1; i < barNumber+1; i++) { |
| 2134 | + barContent += '<div class="bar' + i + '" style="-moz-transform:rotate(' + (i-1) * barSpacingDegrees + 'deg) translate(0, -40px);-webkit-transform:rotate(' + (i-1) * barSpacingDegrees + 'deg) translate(0, -40px);opacity:' + (i) * barOpacityDelta + '; background:#000"/>'; |
| 2135 | + } |
| 2136 | + $j( this ).html( |
| 2137 | + $j( '<div />' ) |
| 2138 | + .addClass( "cssLoadingSpinner" ) |
| 2139 | + .html( barContent ) |
| 2140 | + ); |
| 2141 | + var rotations = 0; |
| 2142 | + setInterval( function ( ) { |
| 2143 | + $j('.cssLoadingSpinner') |
| 2144 | + .css('-moz-transform','rotate('+rotations+'deg)') |
| 2145 | + .css('-webkit-transform','rotate('+rotations+'deg)'); |
| 2146 | + if( rotations == 360 ) { |
| 2147 | + rotations = 0; |
| 2148 | + } |
| 2149 | + rotations += 5; |
| 2150 | + }, 25); |
| 2151 | + } |
| 2152 | + else { |
| 2153 | + $j( this ).html( |
| 2154 | + $j( '<div />' ) |
| 2155 | + .addClass( "loadingSpinner" ) |
| 2156 | + ); |
| 2157 | + } |
2132 | 2158 | return this; |
2133 | | - } |
| 2159 | + }} |
2134 | 2160 | |
2135 | 2161 | /** |
2136 | 2162 | * dragDrop file loader |
Index: branches/MwEmbedStandAlone/tests/mwEmbed_Demo.html |
— | — | @@ -3,12 +3,12 @@ |
4 | 4 | <head> |
5 | 5 | <title>mwEmbed Testing Kit</title> |
6 | 6 | |
| 7 | + <link rel="stylesheet" href="style.css" type="text/css" media="screen" /> |
| 8 | + <script type="text/javascript" src="jslib/jquery.js"></script> |
7 | 9 | <link type="text/css" rel="stylesheet" href="jslib/syntax/prettify.css" /> |
8 | 10 | <link rel="stylesheet" type="text/css" media="screen" href="jslib/menu/css/superfish.css" /> |
9 | 11 | <link rel="stylesheet" type="text/css" media="screen" href="jslib/menu/css/superfish-vertical.css" /> |
10 | | - <link rel="stylesheet" href="style.css" type="text/css" media="screen" /> |
11 | | - |
12 | | - <script type="text/javascript" src="jslib/jquery.js"></script> |
| 12 | + |
13 | 13 | <script type="text/javascript" src="jslib/syntax/prettify.js"></script> |
14 | 14 | <script type="text/javascript" src="jslib/menu/hoverIntent.js"></script> |
15 | 15 | <script type="text/javascript" src="jslib/menu/superfish.js"></script> |
— | — | @@ -16,8 +16,13 @@ |
17 | 17 | |
18 | 18 | <script type="text/javascript" src="../libraries/jquery/jquery.ui/ui/ui.resizable.js"></script> |
19 | 19 | <script type="text/javascript" src="../libraries/jquery/jquery.ui/ui/ui.draggable.js"></script> |
| 20 | + |
| 21 | + |
| 22 | + <script type="text/javascript" src="../mwEmbed.js?debug=true"></script> |
| 23 | + <!-- |
20 | 24 | <script type="text/javascript" src="http://html5.kaltura.org/js" > </script> |
21 | | - <!-- <script type="text/javascript" src="../mwEmbed.js?debug=true"></script> --> |
| 25 | + |
| 26 | + --> |
22 | 27 | |
23 | 28 | <script type="text/javascript"> |
24 | 29 | $(function () { |
— | — | @@ -56,8 +61,8 @@ |
57 | 62 | poster="http://upload.wikimedia.org/wikipedia/commons/thumb/b/bd/Elephants_Dream.ogg/seek%3D13-Elephants_Dream.ogg.jpg" |
58 | 63 | duration="10:53" |
59 | 64 | linkback="http://www.elephantsdream.org/" > |
60 | | - <source type="video/ogg" src="http://ia311040.us.archive.org/3/items/ElephantsDream/ed_1024.ogv" > |
61 | | - <source type="video/h264" src="http://ia311040.us.archive.org/3/items/ElephantsDream/ed_hd_512kb.mp4" > |
| 65 | + <source type="video/webm" src="media/out500.webm" > |
| 66 | + <source type="video/ogg" src="media/out500.ogv" > |
62 | 67 | |
63 | 68 | <!-- Subtitles --> |
64 | 69 | |
— | — | @@ -175,7 +180,7 @@ |
176 | 181 | |
177 | 182 | </div><!-- END demo_player --> |
178 | 183 | |
179 | | - <div id="docbox" class="ui-widget-content"> |
| 184 | + <!-- <div id="docbox" class="ui-widget-content"> |
180 | 185 | <h3 class="ui-widget-header">mwEmbed Documentation</h3> |
181 | 186 | <p> there will be a menu here to switch between the README and the generated docs</p> |
182 | 187 | <div id="jsdocs"> |
— | — | @@ -183,16 +188,16 @@ |
184 | 189 | </iframe> |
185 | 190 | </div> |
186 | 191 | |
187 | | - </div><!-- end sideBox --> |
| 192 | + </div> end sideBox --> |
188 | 193 | |
189 | | - <div id="js-console" class="ui-widget-content"> |
| 194 | + <!-- <div id="js-console" class="ui-widget-content"> |
190 | 195 | <h3 class="ui-widget-header">mwEmbed Controls</h3> |
191 | 196 | <p>Textboxes and buttons for interacting with the demonstration player.</p> |
192 | 197 | </div> |
193 | 198 | |
194 | 199 | <div id="help" style="display:none;"> |
195 | 200 | <p>Instructions will go here</p> |
196 | | - </div><!-- END help --> |
| 201 | + </div> END help --> |
197 | 202 | |
198 | 203 | |
199 | 204 | </div><!-- END content --> |
Index: branches/MwEmbedStandAlone/tests/style.css |
— | — | @@ -8,8 +8,8 @@ |
9 | 9 | body, td, th, pre, code, select, option, input, textarea { |
10 | 10 | font-family:"Trebuchet MS", Arial, Sans-serif; |
11 | 11 | font-size:10pt; |
12 | | - color: white; |
13 | | - background-color: black; |
| 12 | + color: black; |
| 13 | + background-color: white; |
14 | 14 | } |
15 | 15 | |
16 | 16 | #container { width:700px; margin:10px auto; overflow:hidden; } |