| Index: branches/MwEmbedStandAlone/mwEmbed.js |
| — | — | @@ -95,7 +95,8 @@ |
| 96 | 96 | } |
| 97 | 97 | // Check if we should "merge" the config |
| 98 | 98 | if( typeof value == 'object' && typeof mwConfig[ name ] == 'object' ) { |
| 99 | | - if ( value.constructor.toString().indexOf("Array") == -1 ){ |
| | 99 | + if ( value.constructor.toString().indexOf("Array") != -1 && |
| | 100 | + mwConfig[ name ].constructor.toString().indexOf("Array") != -1 ){ |
| 100 | 101 | // merge in the array |
| 101 | 102 | mwConfig[ name ] = mwConfig[ name ].concat( value ); |
| 102 | 103 | } else { |
| Index: branches/MwEmbedStandAlone/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r173'; |
| | 8 | +var mwRemoteVersion = 'r174'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Log the mwRemote version makes it easy to debug cache issues |
| — | — | @@ -575,17 +575,20 @@ |
| 576 | 576 | // Add full window binding if embedplayer flag set: |
| 577 | 577 | if( mwReqParam['embedplayer'] == 'yes' ){ |
| 578 | 578 | $j('#loadingPlayer').remove(); |
| 579 | | - $j('body').css('overflow', 'hidden'); |
| 580 | | - $j( '#mwe_' + vidId ).get(0).resizePlayer({ |
| 581 | | - 'width' : $j(window).width(), |
| 582 | | - 'height' : $j(window).height() |
| 583 | | - }); |
| 584 | | - $j(window).unbind().resize(function(){ |
| | 579 | + $j('body').css('overflow', 'hidden'); |
| | 580 | + // Add a small timeout chrome runs things out of order sometimes |
| | 581 | + setTimeout( function(){ |
| 585 | 582 | $j( '#mwe_' + vidId ).get(0).resizePlayer({ |
| 586 | 583 | 'width' : $j(window).width(), |
| 587 | 584 | 'height' : $j(window).height() |
| 588 | | - }); |
| 589 | | - }); |
| | 585 | + }); |
| | 586 | + $j(window).unbind().resize(function(){ |
| | 587 | + $j( '#mwe_' + vidId ).get(0).resizePlayer({ |
| | 588 | + 'width' : $j(window).width(), |
| | 589 | + 'height' : $j(window).height() |
| | 590 | + }); |
| | 591 | + }); |
| | 592 | + }, 10); |
| 590 | 593 | } |
| 591 | 594 | |
| 592 | 595 | // Issue an async request to rewrite the next clip |