Fomafix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333368 )
Change subject: Use module 'mediawiki.storage' from core to access localStorage
......................................................................
Use module 'mediawiki.storage' from core to access localStorage
This change requires MediaWiki version 1.26 and removes support for lower
versions.
Bug: T153635
Change-Id: Ia74e16cb08e8cb1f15196a98329e2994b0283edb
---
M extension.json
M resources/js/ext.uls.interface.js
2 files changed, 8 insertions(+), 29 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/68/333368/1
diff --git a/extension.json b/extension.json
index f5a21e0..eae7fc4 100644
--- a/extension.json
+++ b/extension.json
@@ -201,6 +201,7 @@
"dependencies": [
"ext.uls.common",
"mediawiki.jqueryMsg",
+ "mediawiki.storage",
"mediawiki.user",
"ext.uls.webfonts"
],
diff --git a/resources/js/ext.uls.interface.js
b/resources/js/ext.uls.interface.js
index 0e7d38b..6a9cd3b 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -20,24 +20,6 @@
( function ( $, mw ) {
'use strict';
- // Replace with mediawiki.storage when >= MW 1.26
- var Store = function ( key ) {
- this.key = key;
- };
-
- // Returns null if key does not exist according to documentation.
- Store.prototype.get = function () {
- try {
- return localStorage.getItem( this.key );
- } catch ( e ) {}
- };
-
- Store.prototype.set = function ( value ) {
- try {
- localStorage.setItem( this.key, value );
- } catch ( e ) {}
- };
-
/**
* Construct the display settings link
*
@@ -464,26 +446,22 @@
}
function initTooltip() {
- var previousLanguageCodeStore, previousLanguageAutonymStore,
module,
- previousLanguage, currentLanguage, previousAutonym,
currentAutonym;
+ var module, previousLanguage, currentLanguage, previousAutonym,
currentAutonym;
if ( !userCanChangeLanguage() ) {
return;
}
- previousLanguageCodeStore = new Store(
'uls-previous-language-code' );
- previousLanguageAutonymStore = new Store(
'uls-previous-language-autonym' );
-
- previousLanguage = previousLanguageCodeStore.get();
+ previousLanguage = mw.storage.get( 'uls-previous-language-code'
);
currentLanguage = mw.config.get( 'wgUserLanguage' );
- previousAutonym = previousLanguageAutonymStore.get();
+ previousAutonym = mw.storage.get(
'uls-previous-language-autonym' );
currentAutonym = mw.config.get( 'wgULSCurrentAutonym' );
// If storage is empty, i.e. first visit, then store the
current language
// immediately so that we know when it changes.
if ( !previousLanguage || !previousAutonym ) {
- previousLanguageCodeStore.set( currentLanguage );
- previousLanguageAutonymStore.set( currentAutonym );
+ mw.storage.set( 'uls-previous-language-code',
currentLanguage );
+ mw.storage.set( 'uls-previous-language-autonym',
currentAutonym );
return;
}
@@ -493,8 +471,8 @@
mw.loader.using( module ).done( function () {
showUndoTooltip( previousLanguage,
previousAutonym );
} );
- previousLanguageCodeStore.set( currentLanguage );
- previousLanguageAutonymStore.set( currentAutonym );
+ mw.storage.set( 'uls-previous-language-code',
currentLanguage );
+ mw.storage.set( 'uls-previous-language-autonym',
currentAutonym );
// Store this language in a list of frequently used
languages
mw.uls.addPreviousLanguage( currentLanguage );
}
--
To view, visit https://gerrit.wikimedia.org/r/333368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia74e16cb08e8cb1f15196a98329e2994b0283edb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Fomafix <foma...@googlemail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
