From 0d2359bdb6b5313728629cbe2c006a6eaf70554b Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 11 Oct 2022 17:01:54 +0300 Subject: [PATCH] [DE PE SSE] Turn off alt hints on mac in FireFox (there is shortcut F6 to select link in address bar) --- apps/common/main/lib/controller/HintManager.js | 4 ++-- apps/documenteditor/main/app/view/FileMenuPanels.js | 2 +- apps/presentationeditor/main/app/view/FileMenuPanels.js | 2 +- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js index 305cbe761..2da3e4363 100644 --- a/apps/common/main/lib/controller/HintManager.js +++ b/apps/common/main/lib/controller/HintManager.js @@ -457,7 +457,7 @@ Common.UI.HintManager = new(function() { }; var _init = function(api) { - if (Common.Utils.isIE) + if (Common.Utils.isIE || Common.UI.isMac && Common.Utils.isGecko) // turn off hints on IE and FireFox (shortcut F6 selects link in address bar) return; _api = api; @@ -664,7 +664,7 @@ Common.UI.HintManager = new(function() { }; var _clearHints = function (isComplete) { - if (Common.Utils.isIE) + if (Common.Utils.isIE || Common.UI.isMac && Common.Utils.isGecko) return; _hintVisible && _hideHints(); if (_currentHints.length > 0) { diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 5b83a8a9a..8f0f46f90 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -410,7 +410,7 @@ define([ dataHintDirection: 'left', dataHintOffset: 'small' }); - Common.Utils.isIE && this.chUseAltKey.$el.parent().parent().hide(); + (Common.Utils.isIE || Common.Utils.isMac && Common.Utils.isGecko) && this.chUseAltKey.$el.parent().parent().hide(); /** coauthoring begin **/ this.chLiveComment = new Common.UI.CheckBox({ diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index cf6cfcbc5..129b0778e 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -359,7 +359,7 @@ define([ dataHintDirection: 'left', dataHintOffset: 'small' }); - Common.Utils.isIE && this.chUseAltKey.$el.parent().parent().hide(); + (Common.Utils.isIE || Common.Utils.isMac && Common.Utils.isGecko) && this.chUseAltKey.$el.parent().parent().hide(); this.cmbZoom = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-zoom'), diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index b8895b09a..e2a68973e 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -378,7 +378,7 @@ define([ dataHintDirection: 'left', dataHintOffset: 'small' }); - Common.Utils.isIE && this.chUseAltKey.$el.parent().parent().hide(); + (Common.Utils.isIE || Common.Utils.isMac && Common.Utils.isGecko) && this.chUseAltKey.$el.parent().parent().hide(); this.rbCoAuthModeFast = new Common.UI.RadioBox({ el : $markup.findById('#fms-rb-coauth-mode-fast'),