jenkins-bot has submitted this change and it was merged.
Change subject: Fix: ContentTranslation has an unguarded call to
localStorage.setItem()
......................................................................
Fix: ContentTranslation has an unguarded call to localStorage.setItem()
Now uses mediawiki.storage module.
Bug: T125369
Change-Id: I43241746c8d9806f0fc3cd6ff3b30a631c8f9828
---
M extension.json
M modules/dashboard/ext.cx.dashboard.js
M modules/dashboard/ext.cx.suggestionlist.js
M modules/source/ext.cx.source.selector.js
4 files changed, 14 insertions(+), 25 deletions(-)
Approvals:
Nikerabbit: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 637376d..3b87668 100644
--- a/extension.json
+++ b/extension.json
@@ -261,10 +261,11 @@
"ext.cx.model",
"ext.cx.sitemapper",
"ext.cx.source.selector",
- "ext.cx.translationlist",
"ext.cx.suggestionlist",
+ "ext.cx.translationlist",
"ext.uls.mediawiki",
"mediawiki.Uri",
+ "mediawiki.storage",
"mediawiki.ui.button"
],
"messages": [
@@ -372,13 +373,14 @@
"source/styles/ext.cx.source.selector.less"
],
"dependencies": [
- "ext.cx.sitemapper",
"ext.cx.pageselector",
+ "ext.cx.sitemapper",
"ext.cx.widgets.overlay",
"ext.uls.mediawiki",
"jquery.suggestions",
"jquery.throttle-debounce",
"jquery.uls.compact",
+ "mediawiki.storage",
"mediawiki.ui.button"
],
"messages": [
@@ -874,9 +876,10 @@
"dashboard/styles/ext.cx.suggestionlist.less"
],
"dependencies": [
- "ext.cx.util",
"ext.cx.recommendtool.client",
- "jquery.uls.data"
+ "ext.cx.util",
+ "jquery.uls.data",
+ "mediawiki.storage"
],
"messages": [
"cx-suggestionlist-collapse",
diff --git a/modules/dashboard/ext.cx.dashboard.js
b/modules/dashboard/ext.cx.dashboard.js
index 0ff4724..2f83c7b 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -49,11 +49,7 @@
return;
}
- try {
- storedSourceLanguage = localStorage.getItem(
'cxSourceLanguage' );
- } catch ( e ) {
- // Local storage disabled?
- }
+ storedSourceLanguage = mw.storage.get( 'cxSourceLanguage' );
// Show suggestions tab by default when user is coming from a
campaign
// entry point and does not have any previous cx source
language.
diff --git a/modules/dashboard/ext.cx.suggestionlist.js
b/modules/dashboard/ext.cx.suggestionlist.js
index 32c5c28..f75ecb9 100644
--- a/modules/dashboard/ext.cx.suggestionlist.js
+++ b/modules/dashboard/ext.cx.suggestionlist.js
@@ -79,12 +79,8 @@
var storedTargetLanguage, storedSourceLanguage,
query = new mw.Uri().query;
- try {
- storedTargetLanguage = localStorage.getItem(
'cxTargetLanguage' );
- storedSourceLanguage = localStorage.getItem(
'cxSourceLanguage' );
- } catch ( e ) {
- // Local storage disabled?
- }
+ storedTargetLanguage = mw.storage.get( 'cxTargetLanguage' );
+ storedSourceLanguage = mw.storage.get( 'cxSourceLanguage' );
// Find a sensible language pair.
this.sourceLanguage = query.from || storedSourceLanguage ||
'en';
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index 19edc76..80b3beb 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -202,9 +202,7 @@
this.$sourceTitleInput.prop( langProps );
this.$sourceLanguage.prop( langProps )
.text( $.uls.data.getAutonym( language ) );
- if ( window.localStorage ) {
- localStorage.setItem( 'cxSourceLanguage', language );
- }
+ mw.storage.set( 'cxSourceLanguage', language );
this.fillTargetLanguages();
};
@@ -231,9 +229,7 @@
this.$targetTitleInput.prop( langProps );
this.$targetLanguage.prop( langProps )
.text( $.uls.data.getAutonym( language ) );
- if ( window.localStorage ) {
- localStorage.setItem( 'cxTargetLanguage', language );
- }
+ mw.storage.set( 'cxTargetLanguage', language );
};
/**
@@ -792,10 +788,8 @@
targetLanguage, sourceLanguage,
commonSourceLanguages, i;
- if ( window.localStorage ) {
- storedTargetLanguage = localStorage.getItem(
'cxTargetLanguage' );
- storedSourceLanguage = localStorage.getItem(
'cxSourceLanguage' );
- }
+ storedTargetLanguage = mw.storage.get( 'cxTargetLanguage' );
+ storedSourceLanguage = mw.storage.get( 'cxSourceLanguage' );
targetLanguage = storedTargetLanguage || mw.config.get(
'wgContentLanguage' );
sourceLanguage = storedSourceLanguage;
--
To view, visit https://gerrit.wikimedia.org/r/267649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43241746c8d9806f0fc3cd6ff3b30a631c8f9828
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
