From 7d90ecef1d90bdab8c156c6f844bbc421d59f21a Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Tue, 12 Apr 2016 11:33:36 +0530 Subject: [PATCH] Use localstorage instead of cookie for previous language autonym Change-Id: I1025a8bbb9fad0cfd326547a09c982925a55e55d --- resources/js/ext.uls.init.js | 1 - resources/js/ext.uls.interface.js | 23 ++++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js index b0d989b9..db29524b 100644 --- a/resources/js/ext.uls.init.js +++ b/resources/js/ext.uls.init.js @@ -24,7 +24,6 @@ mw.uls = mw.uls || {}; mw.uls.previousLanguagesStorageKey = 'uls-previous-languages'; - mw.uls.previousLanguageAutonymCookie = 'uls-previous-language-autonym'; mw.uls.languageSettingsModules = [ 'ext.uls.inputsettings', 'ext.uls.displaysettings' ]; /** diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js index 939b31d0..edfcfc8f 100644 --- a/resources/js/ext.uls.interface.js +++ b/resources/js/ext.uls.interface.js @@ -20,6 +20,8 @@ ( function ( $, mw ) { 'use strict'; + var previousLanguageAutonymStorageKey = 'uls-previous-language-autonym'; + /** * Construct the display settings link * @@ -176,9 +178,12 @@ * @return {jQuery.Promise} */ function getUndoAutonym( code ) { - var - deferred = $.Deferred(), - autonym = $.cookie( mw.uls.previousLanguageAutonymCookie ); + var autonym, + deferred = $.Deferred(); + + try { + autonym = localStorage.getItem( previousLanguageAutonymStorageKey ); + } catch ( e ) {} if ( autonym ) { mw.loader.using( 'jquery.tipsy', function () { @@ -313,14 +318,14 @@ } ); // Now that we set the previous languages, - // we can set the cookie of the previous autonym. + // we can store the previous autonym. // TODO: Refactor this, because it doesn't directly belong // to the tooltip. - $.cookie( mw.uls.previousLanguageAutonymCookie, - mw.config.get( 'wgULSCurrentAutonym' ), { - path: '/' - } - ); + try { + localStorage.setItem( + previousLanguageAutonymStorageKey, mw.config.get( 'wgULSCurrentAutonym' ) + ); + } catch ( e ) {} } function initInterface() {