http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74142
Revision: 74142
Author: dale
Date: 2010-10-02 14:16:23 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
fixed font size
updated version number
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
2010-10-02 13:51:06 UTC (rev 74141)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
2010-10-02 14:16:23 UTC (rev 74142)
@@ -520,7 +520,25 @@
'height' :imageTargetHeight
})
});
- })
+ });
+ // Switch any named font-size attribute to em
+ /*$htmlLayout.find('[style]').each( function(inx, node){
+ if( $j(node).css('font-size') ){
+ if( _this.emFontSizeMap[ $j(node).css('font-size') ] ){
+ $j(node).css('font-size', _this.emFontSizeMap[
$j(node).css('font-size') ] );
+ } else {
+ //@@ todo translate absolute pixle size to
relative
+ }
+ }
+ });*/
+ // Switch any named font-size attribute to relative
pixle size
+ $htmlLayout.find('[style]').each( function(inx, node){
+ if( $j(node).css('font-size') ){
+ $j(node).css('font-size',
+ ( fontScalePercent * parseFloat(
$j(node).css('font-size') ) ) + 'px'
+ );
+ }
+ })
// Strip any links for thumbs of player
$htmlLayout.find('a').attr('href', '#');
@@ -953,7 +971,7 @@
'textColor' : 'color',
'textFontSize' : 'font-size',
'textFontStyle' : 'font-style'
- }
+ };
var cssAttributes = {};
for(var i =0; i < $smilElement[0].attributes.length; i++ ){
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-10-02 13:51:06 UTC
(rev 74141)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-10-02 14:16:23 UTC
(rev 74142)
@@ -4,7 +4,7 @@
*/
var urlparts = getRemoteEmbedPath();
var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = 'r155';
+var mwRemoteVersion = 'r156';
var mwUseScriptLoader = true;
// Log the mwRemote version makes it easy to debug cache issues
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
