From 77515dd664c00f0a235daa5fb756eddae6ccdaee Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Tue, 21 Aug 2012 10:08:53 +0530
Subject: [PATCH] Use new jquery.uls and preferences system

Change-Id: I0e626320f494597e9125d394fb9bbbceccfff34c
---
 resources/js/ext.uls.displaysettings.js | 42 ++++++-------------------
 resources/js/ext.uls.webfonts.js        | 27 ++++++++--------
 2 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index 9ab7e66a..8909a701 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -59,7 +59,7 @@
 		this.contentLanguage = this.getContentLanguage();
 		this.$webfonts = null;
 		this.$parent = $parent;
-		this.webfontPreferences = new $.fn.uls.preferences( 'webfonts' );
+		this.webfontPreferences = mw.uls.preferences( 'webfonts' );
 	};
 
 	DisplaySettings.prototype = {
@@ -283,10 +283,12 @@
 
 			this.$template.find( '#webfonts-enable-checkbox' ).on( 'click', function () {
 				if ( this.checked ) {
+					that.webfontPreferences.set( 'webfonts-enabled', true );
 					$contentFontSelector.prop( "disabled", false );
 					$uiFontSelector.prop( "disabled", false );
 					that.$webfonts.apply( $uiFontSelector.find( 'option:selected' ) );
 				} else {
+					that.webfontPreferences.set( 'webfonts-enabled', false );
 					$contentFontSelector.prop( "disabled", true );
 					$uiFontSelector.prop( "disabled", true );
 					that.$webfonts.reset();
@@ -295,22 +297,14 @@
 
 			$uiFontSelector.on( "change", function () {
 				var font = $( this ).find( 'option:selected' ).val();
-
-				if ( that.uiLanguage === that.getUILanguage() ) {
-					if ( font === 'system' ) {
-						that.$webfonts.reset();
-					} else {
-						that.$webfonts.apply( font );
-					}
-				}
+				that.webfontPreferences.set( that.uiLanguage, font );
+				that.$webfonts.refresh();
 			} );
+
 			$contentFontSelector.on( "change", function () {
 				var font = $( this ).find( 'option:selected' ).val();
-				if ( font === 'system' ) {
-					that.$webfonts.reset();
-				} else {
-					that.$webfonts.apply( font );
-				}
+				that.webfontPreferences.set( that.contentLanguage, font );
+				that.$webfonts.refresh();
 			} );
 
 		},
@@ -332,6 +326,8 @@
 		 */
 		onSave: function ( success ) {
 			if ( success ) {
+				// Live font update
+				this.$webfonts.refresh();
 				this.$parent.hide();
 				// we delay change UI language to here, because it causes a page refresh
 				if ( this.uiLanguage !== this.getUILanguage() ) {
@@ -347,26 +343,8 @@
 		 */
 		apply: function () {
 			var that = this;
-			var uiFont = this.$template.find( "select#ui-font-selector" )
-				.find( 'option:selected' ).val();
-			var contentFont = this.$template.find( "select#content-font-selector" )
-				.find( 'option:selected' ).val();
-			var webfontEnabled = this.$template.find( '#webfonts-enable-checkbox' )
-				.prop( 'checked' ) ? true : false;
-
-			// Live font update if current UI language match with language selection
-			if ( ( this.uiLanguage === this.getUILanguage() ) && webfontEnabled ) {
-				if ( uiFont === 'system' ) {
-					this.$webfonts.reset();
-				} else {
-					this.$webfonts.apply( uiFont );
-				}
-			}
 
 			// Save the preferences
-			this.webfontPreferences.set( this.uiLanguage, uiFont );
-			this.webfontPreferences.set( this.contentLanguage, contentFont );
-			this.webfontPreferences.set( 'webfonts-enabled', webfontEnabled );
 			this.webfontPreferences.save( function ( result ) {
 				// closure for not losing the scope
 				that.onSave( result );
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index 1dac8136..ca11d542 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -21,23 +21,22 @@
 
 	$( document ).ready( function() {
 		var mediawikiFontRepository = $.webfonts.repository;
-
+		var webfontsPreferences = mw.uls.preferences( 'webfonts' );
 		mediawikiFontRepository.base = mw.config.get( 'wgExtensionAssetsPath' )
 			+ '/UniversalLanguageSelector/data/fontrepo/fonts/';
-
+		// Initialize webfonts
 		$( 'body' ).webfonts( {
-			repository: mediawikiFontRepository
+			repository: mediawikiFontRepository,
+			fontSelector: function ( repository, language ) {
+				var font = webfontsPreferences.get( language );
+				if ( !font ) {
+					font = repository.defaultFont(language);
+				}
+				if ( font === 'system' ) {
+					font = null;
+				}
+				return font;
+			}
 		} );
-
-		var $webfonts = $( 'body' ).data( 'webfonts' );
-		var webfontPreferences = new $.fn.uls.preferences( 'webfonts' );
-		var rememberedFont = webfontPreferences.get( mw.config.get( 'wgUserLanguage' ) );
-
-		if ( rememberedFont === 'system' ) {
-			$webfonts.reset();
-		} else {
-			// FIXME: jquery.webfonts should have an option to specify default font to use.
-			$webfonts.apply( rememberedFont );
-		}
 	} );
 } )( jQuery, mediaWiki );