| Index: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js |
| — | — | @@ -520,7 +520,25 @@ |
| 521 | 521 | 'height' :imageTargetHeight |
| 522 | 522 | }) |
| 523 | 523 | }); |
| 524 | | - }) |
| | 524 | + }); |
| | 525 | + // Switch any named font-size attribute to em |
| | 526 | + /*$htmlLayout.find('[style]').each( function(inx, node){ |
| | 527 | + if( $j(node).css('font-size') ){ |
| | 528 | + if( _this.emFontSizeMap[ $j(node).css('font-size') ] ){ |
| | 529 | + $j(node).css('font-size', _this.emFontSizeMap[ $j(node).css('font-size') ] ); |
| | 530 | + } else { |
| | 531 | + //@@ todo translate absolute pixle size to relative |
| | 532 | + } |
| | 533 | + } |
| | 534 | + });*/ |
| | 535 | + // Switch any named font-size attribute to relative pixle size |
| | 536 | + $htmlLayout.find('[style]').each( function(inx, node){ |
| | 537 | + if( $j(node).css('font-size') ){ |
| | 538 | + $j(node).css('font-size', |
| | 539 | + ( fontScalePercent * parseFloat( $j(node).css('font-size') ) ) + 'px' |
| | 540 | + ); |
| | 541 | + } |
| | 542 | + }) |
| 525 | 543 | |
| 526 | 544 | // Strip any links for thumbs of player |
| 527 | 545 | $htmlLayout.find('a').attr('href', '#'); |
| — | — | @@ -953,7 +971,7 @@ |
| 954 | 972 | 'textColor' : 'color', |
| 955 | 973 | 'textFontSize' : 'font-size', |
| 956 | 974 | 'textFontStyle' : 'font-style' |
| 957 | | - } |
| | 975 | + }; |
| 958 | 976 | |
| 959 | 977 | var cssAttributes = {}; |
| 960 | 978 | for(var i =0; i < $smilElement[0].attributes.length; i++ ){ |
| 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 = 'r155'; |
| | 8 | +var mwRemoteVersion = 'r156'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Log the mwRemote version makes it easy to debug cache issues |