From 88f484efb576ad4adcb85b3e71305cbad03cf783 Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Thu, 15 May 2025 13:13:26 +0300 Subject: [PATCH] Use common key for recent langs --- apps/common/main/lib/view/LanguageDialog.js | 4 +--- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/documenteditor/main/app/view/DocumentHolder.js | 2 +- apps/documenteditor/main/app/view/Statusbar.js | 6 +++--- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/view/DocumentHolder.js | 2 +- apps/presentationeditor/main/app/view/Statusbar.js | 6 +++--- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js index 1374e60a14..98e4d32229 100644 --- a/apps/common/main/lib/view/LanguageDialog.js +++ b/apps/common/main/lib/view/LanguageDialog.js @@ -74,9 +74,7 @@ define([], function () { 'use strict'; var $window = this.getChild(); $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); - var filter = Common.localStorage.getKeysFilter(), - lckey = ((filter && filter.length) ? filter.split(',')[0] : '') + "settings-recent-langs"; - + var lckey = "app-settings-recent-langs"; this.cmbLanguage = new Common.UI.ComboBoxRecent({ el: $window.find('#id-document-language'), cls: 'input-group-nr', diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 4126fb2551..7db49fe2fa 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2818,7 +2818,7 @@ define([ } sLangs = arr; - let recentKey = 'de-settings-recent-langs', + let recentKey = 'app-settings-recent-langs', recentCount = Math.max(5, sLangs.length + 3); Common.Utils.InternalSettings.set(recentKey + "-count", recentCount); Common.Utils.InternalSettings.set(recentKey + "-offset", sLangs.length); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index e75bb0daee..b7419b58ef 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -215,7 +215,7 @@ define([ arrPara.push(item); arrTable.push(_.clone(item)); }); - var lckey = 'de-settings-recent-langs'; + var lckey = 'app-settings-recent-langs'; me.langParaMenu.menu.setRecent({ count: Common.Utils.InternalSettings.get(lckey + "-count") || 5, offset: Common.Utils.InternalSettings.get(lckey + "-offset") || 0, diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 75e83a8691..41814dfbac 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -414,9 +414,9 @@ define([ }); }); this.langMenu.setRecent({ - count: Common.Utils.InternalSettings.get("de-settings-recent-langs-count") || 5, - offset: Common.Utils.InternalSettings.get("de-settings-recent-langs-offset") || 0, - key: 'de-settings-recent-langs' + count: Common.Utils.InternalSettings.get("app-settings-recent-langs-count") || 5, + offset: Common.Utils.InternalSettings.get("app-settings-recent-langs-offset") || 0, + key: 'app-settings-recent-langs' }); this.langMenu.resetItems(arr); if (this.langMenu.items.length>0) { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 24eecefb13..e5e12a7f9e 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2368,7 +2368,7 @@ define([ } sLangs = arr; - let recentKey = 'pe-settings-recent-langs', + let recentKey = 'app-settings-recent-langs', recentCount = Math.max(5, sLangs.length + 3); Common.Utils.InternalSettings.set(recentKey + "-count", recentCount); Common.Utils.InternalSettings.set(recentKey + "-offset", sLangs.length); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index fed0016675..d9a493f4f2 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -239,7 +239,7 @@ define([ arrPara.push(item); arrTable.push(_.clone(item)); }); - var lckey = 'pe-settings-recent-langs'; + var lckey = 'app-settings-recent-langs'; me.langParaMenu.menu.setRecent({ count: Common.Utils.InternalSettings.get(lckey + "-count") || 5, offset: Common.Utils.InternalSettings.get(lckey + "-offset") || 0, diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 13f77acd88..aafe2b5ac0 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -363,9 +363,9 @@ define([ }); }); this.langMenu.setRecent({ - count: Common.Utils.InternalSettings.get("pe-settings-recent-langs-count") || 5, - offset: Common.Utils.InternalSettings.get("pe-settings-recent-langs-offset") || 0, - key: 'pe-settings-recent-langs' + count: Common.Utils.InternalSettings.get("app-settings-recent-langs-count") || 5, + offset: Common.Utils.InternalSettings.get("app-settings-recent-langs-offset") || 0, + key: 'app-settings-recent-langs' }); this.langMenu.resetItems(arr); if (this.langMenu.items.length>0) {