Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84779
Change subject: Optionally exclude elements from applying webfonts
......................................................................
Optionally exclude elements from applying webfonts
* Updates jquery.webfonts from upstream
* Introduces wgULSWebFontExcludeSelector cnfiguration variable. It
takes an array of jquery selector to which webfonts will not be
applied if defined.
Change-Id: I0dc263f84620af4077f52e18eeb0f986ff0f13b9
---
M UniversalLanguageSelector.hooks.php
M UniversalLanguageSelector.php
M lib/jquery.webfonts.js
M resources/js/ext.uls.webfonts.js
4 files changed, 16 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/79/84779/1
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 3fc37be..58fa904 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -248,7 +248,7 @@
* @return bool
*/
public static function addConfig( &$vars ) {
- global $wgULSGeoService, $wgULSIMEEnabled, $wgULSPosition,
+ global $wgULSGeoService, $wgULSIMEEnabled, $wgULSPosition,
$wgULSWebFontExcludeSelector,
$wgULSAnonCanChangeLanguage, $wgULSEventLogging,
$wgULSNoImeSelectors;
// Place constant stuff here (not depending on request context)
@@ -260,6 +260,7 @@
$vars['wgULSAnonCanChangeLanguage'] =
$wgULSAnonCanChangeLanguage;
$vars['wgULSEventLogging'] = $wgULSEventLogging;
$vars['wgULSNoImeSelectors'] = $wgULSNoImeSelectors;
+ $vars['wgULSWebFontExcludeSelector'] =
$wgULSWebFontExcludeSelector;
return true;
}
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 1d5dd15..bc168fa 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -130,6 +130,14 @@
*/
$wgULSNoImeSelectors = array( '#wpCaptchaWord' );
+
+/**
+ * Array of jQuery selectors of elements on which webfonts must not be applied.
+ *
+ * @since 2013.09
+ */
+$wgULSWebFontExcludeSelector = array();
+
$dir = __DIR__;
// Internationalization
diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index b4c0b5e..c089467 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -190,6 +190,10 @@
var fontFamilyStyle, fontFamily,
$element = $( element );
+ if ( $element.is( webfonts.options.exclude ) ) {
+ return;
+ }
+
// Note: it depends on the browser whether this
returns font names
// which don't exist. In Chrome it does, while
in Opera it doesn't.
fontFamilyStyle = $element.css( 'fontFamily' );
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index c0922bc..a22ea22 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -87,7 +87,8 @@
// MediaWiki specific overrides for jquery.webfonts
$.extend( $.fn.webfonts.defaults, {
repository: mediawikiFontRepository,
- fontStack: $( 'body' ).css( 'font-family'
).split( /, /g )
+ fontStack: $( 'body' ).css( 'font-family'
).split( /, /g ),
+ exclude: mw.config.get(
'wgULSWebFontExcludeSelector' ).join( ', ' )
} );
mw.webfonts.preferences.load();
--
To view, visit https://gerrit.wikimedia.org/r/84779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dc263f84620af4077f52e18eeb0f986ff0f13b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
