| Index: branches/js2-work/phase3/js/mwEmbed/skins/kskin/playerSkin.css |
| — | — | @@ -125,7 +125,7 @@ |
| 126 | 126 | cursor: pointer; |
| 127 | 127 | float: right; |
| 128 | 128 | list-style: none outside none; |
| 129 | | - margin: 1px; |
| | 129 | + margin-top: 2px; |
| 130 | 130 | padding: 0px 0; |
| 131 | 131 | width: 23px; |
| 132 | 132 | height: 16px; |
| — | — | @@ -367,7 +367,7 @@ |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | .k-player .volume_control { |
| 371 | | - margin-right: 0px; |
| | 371 | + margin-right: 2px; |
| 372 | 372 | width: 16px; |
| 373 | 373 | } |
| 374 | 374 | |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/TimedText/mw.TimedText.js |
| — | — | @@ -321,7 +321,7 @@ |
| 322 | 322 | * Get the layout mode |
| 323 | 323 | * |
| 324 | 324 | * Takes into consideration: |
| 325 | | - * Playback method overlays support ( have to put subtiles bellow video ) |
| | 325 | + * Playback method overlays support ( have to put subtitles bellow video ) |
| 326 | 326 | * |
| 327 | 327 | */ |
| 328 | 328 | getLayoutMode: function(){ |
| — | — | @@ -1213,6 +1213,7 @@ |
| 1214 | 1214 | 'list' : 'allpages', |
| 1215 | 1215 | 'apprefix' : titleKey, |
| 1216 | 1216 | 'apnamespace' : this.getTimedTextNS(), |
| | 1217 | + 'aplimit' : 200, |
| 1217 | 1218 | 'prop':'revisions' |
| 1218 | 1219 | }; |
| 1219 | 1220 | mw.getJSON( this.api_url, request, function( sourcePages ) { |
| Index: branches/js2-work/phase3/js/mwEmbed/mwEmbed.js |
| — | — | @@ -1747,9 +1747,9 @@ |
| 1748 | 1748 | var currentSheet = $j( this) .attr( 'href' ); |
| 1749 | 1749 | var sheetParts = currentSheet.split('?'); |
| 1750 | 1750 | var urlParts = url.split('?'); |
| 1751 | | - //if the base url's match check the pamaters: |
| | 1751 | + //if the base url's match check the parameters: |
| 1752 | 1752 | if( sheetParts[0] == urlParts[0] && sheetParts[1]){ |
| 1753 | | - mw.log(" sheet compare: " + sheetParts[1].split( '&' ).sort().join('') + ' != ' + urlParts[1].split('&').sort().join('')); |
| | 1753 | + //mw.log(" sheet compare: " + sheetParts[1].split( '&' ).sort().join('') + ' != ' + urlParts[1].split('&').sort().join('')); |
| 1754 | 1754 | //Check if url params match ( sort to do string compare ) |
| 1755 | 1755 | if( sheetParts[1].split( '&' ).sort().join('') == |
| 1756 | 1756 | urlParts[1].split('&').sort().join('') ){ |
| — | — | @@ -1758,7 +1758,7 @@ |
| 1759 | 1759 | } |
| 1760 | 1760 | } ); |
| 1761 | 1761 | if( foundSheet ){ |
| 1762 | | - mw.log( 'sheet: ' + url + ' already included ' ); |
| | 1762 | + mw.log( 'skiped sheet: ' + url); |
| 1763 | 1763 | return ; |
| 1764 | 1764 | } |
| 1765 | 1765 | |
| — | — | @@ -1819,7 +1819,8 @@ |
| 1820 | 1820 | if( ! mwpath ){ |
| 1821 | 1821 | mw.log( "Error could not get mwEmbed path " ); |
| 1822 | 1822 | return ; |
| 1823 | | - } |
| | 1823 | + } |
| | 1824 | + |
| 1824 | 1825 | // Update the cached var with the absolute path: |
| 1825 | 1826 | mwEmbedPath = mw.absoluteUrl( mwpath ) ; |
| 1826 | 1827 | return mwEmbedPath; |
| Index: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r60371'; |
| | 8 | +var mwRemoteVersion = 'r72'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Setup up request Params: |
| — | — | @@ -104,6 +104,8 @@ |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | if ( vidIdList.length > 0 ) { |
| | 108 | + //reverse order the array so videos at the "top" get swaped first: |
| | 109 | + vidIdList = vidIdList.reverse(); |
| 108 | 110 | mwLoadPlayer(function(){ |
| 109 | 111 | //Load the "EmbedPlayer" module: |
| 110 | 112 | // All the actual code was requested in our single script-loader call |
| — | — | @@ -234,7 +236,8 @@ |
| 235 | 237 | $j( '#' + vidId ).html( html_out ) |
| 236 | 238 | .css( 'height', pheight + 30 ); |
| 237 | 239 | |
| 238 | | - // Do the actual rewrite |
| | 240 | + // Do the actual rewrite |
| | 241 | + mw.log("rewrite: "+ vidId ); |
| 239 | 242 | $j( '#mwe_' + vidId ).embedPlayer(); |
| 240 | 243 | //issue an async request to rewrite the next clip |
| 241 | 244 | if ( vidIdList.length != 0 ) { |
| — | — | @@ -245,7 +248,7 @@ |
| 246 | 249 | |
| 247 | 250 | } |
| 248 | 251 | }; |
| 249 | | - // Process each item in the vidIdList (with setTimeout to avoid locking) |
| | 252 | + // Process current top item in vidIdList |
| 250 | 253 | procVidId( vidIdList.pop() ); |
| 251 | 254 | } |
| 252 | 255 | |