From 4d1969161c08402cf6493e89afc0e8c50b989195 Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Thu, 30 May 2013 16:35:37 +0530 Subject: [PATCH] Avoid setting inline style for the element when reset applied Followup: Ic3baa18b01a972f08e51e84217e82d0939e674c0 and Iff522e0016d8284dc785580e6eb3dd2967c58289 Bug: 39992 Change-Id: Ifd8c4629f5512f6d54fc0a19d3b8d2bec4db23c0 --- lib/jquery.webfonts.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js index 74dab695..58f3cdbd 100644 --- a/lib/jquery.webfonts.js +++ b/lib/jquery.webfonts.js @@ -95,21 +95,17 @@ 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 if ( !$element.is( this.options.exclude ) ) { $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. // font-family of ,