bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid setting inline style for the element when reset applied

Browse Source 
Followup: Ic3baa18b01a972f08e51e84217e82d0939e674c0 and
	Iff522e0016d8284dc785580e6eb3dd2967c58289
Bug: 39992

Change-Id: Ifd8c4629f5512f6d54fc0a19d3b8d2bec4db23c0
This commit is contained in:
Santhosh Thottingal
2013-05-30 16:35:37 +05:30
parent 000d04c14e
commit 4d1969161c
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/jquery.webfonts.js
View File

@@ -95,21 +95,17 @@
fontStack.unshift( fontFamily ); fontStack.unshift( fontFamily );
} }
if ( !fontFamily || fontFamily === this.originalFontFamily ) {
// We are resetting the font to original font.
fontStack = [];
// This will cause removing inline fontFamily style.
}
// Set the font of this element if it's not excluded // Set the font of this element if it's not excluded
if ( !$element.is( this.options.exclude ) ) { if ( !$element.is( this.options.exclude ) ) {
$element.css( 'font-family', fontStack.join() ); $element.css( 'font-family', fontStack.join() );
} }
if ( !fontFamily || fontFamily === this.originalFontFamily ) {
// We are resetting the font to original font.
// Do not explicitly set fontFamily for child nodes. Just remove
// the previous setting.
$element.find( 'textarea, input, button' )
.not( this.options.exclude )
.css( 'font-family', '' );
return;
}
// Set the font of this element's children if they are not excluded. // Set the font of this element's children if they are not excluded.
// font-family of <input>, <textarea> and <button> must be changed explicitly. // font-family of <input>, <textarea> and <button> must be changed explicitly.
$element.find( 'textarea, input, button' ) $element.find( 'textarea, input, button' )