From fa8e0584b1ebca5e4a5704ad109cc9b7b4f0ae68 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 2 Dec 2021 19:47:03 +0300 Subject: [PATCH 1/7] [DE PE SSE] Fix bug 54263 --- apps/common/main/lib/component/HintManager.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index 170eb68ab..e767d7d11 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -446,7 +446,8 @@ Common.UI.HintManager = new(function() { } }, 10); } else { - var curLetter = null; + var curLetter = null, + match = false; var keyCode = e.keyCode; if (keyCode !== 16 && keyCode !== 17 && keyCode !== 18 && keyCode !== 91) { curLetter = _lang === 'en' ? ((keyCode > 47 && keyCode < 58 || keyCode > 64 && keyCode < 91) ? String.fromCharCode(e.keyCode) : null) : e.key; @@ -462,9 +463,16 @@ Common.UI.HintManager = new(function() { _inputLetters = _inputLetters + curLetter.toUpperCase(); for (var i = 0; i < _currentControls.length; i++) { var item = _currentControls[i]; - if (!_isItemDisabled(item) && item.attr('data-hint-title') === _inputLetters) { - curr = item; - break; + if (!_isItemDisabled(item)) { + var title = item.attr('data-hint-title'), + regExp = new RegExp('^' + _inputLetters + ''); + if (regExp.test(title)) { + match = true; + } + if (title === _inputLetters) { + curr = item; + break; + } } } if (curr) { @@ -526,6 +534,8 @@ Common.UI.HintManager = new(function() { } } } + } else if (!match) { + _inputLetters = ''; } } } From bc0426e9b8a482588638fde06784cde40d0d5e77 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Dec 2021 15:38:00 +0300 Subject: [PATCH 2/7] [DE PE SSE] Bug 54255 --- apps/common/main/lib/component/HintManager.js | 3 +++ apps/documenteditor/main/app/view/FileMenuPanels.js | 4 ++-- apps/presentationeditor/main/app/view/FileMenuPanels.js | 4 ++-- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index e767d7d11..b96cde2d2 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -524,6 +524,9 @@ Common.UI.HintManager = new(function() { if (curr.parent().prop('id') === 'slot-btn-chat') { _nextLevel(1); _setCurrentSection(undefined, $('#left-menu.hint-section')); + } else if (curr.prop('id') === 'id-right-menu-signature') { + _nextLevel(2); + _setCurrentSection(curr); } else { _nextLevel(); _setCurrentSection(curr); diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index aa6187883..9b93c105d 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1848,8 +1848,8 @@ define([ '', '', '', - '', - '', + '', + '', '', '' ].join('')); diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 7f1c7992d..8e2d1c1ed 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -1584,8 +1584,8 @@ define([ '', '', '', - '', - '', + '', + '', '', '' ].join('')); diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 842243220..98faa8010 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -2546,8 +2546,8 @@ define([ '', '', '', - '', - '', + '', + '', '', '' ].join('')); From ac013b0e10575593a82189c4aa9ea2c85a5fc11a Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Dec 2021 15:44:07 +0300 Subject: [PATCH 3/7] [DE] Fix bug 54292 --- apps/documenteditor/main/app/view/FormSettings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 8e6bf0b7e..440628125 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -1157,7 +1157,10 @@ define([ this.btnBGColor = new Common.UI.ColorButton({ parentEl: $('#form-background-color-btn'), transparent: true, - menu: true + menu: true, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.lockedControls.push(this.btnBGColor); this.btnBGColor.on('color:select', _.bind(this.onColorBGSelect, this)); From 1e55ff2377f542fa8f99a535fe1f995020640644 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Dec 2021 15:48:02 +0300 Subject: [PATCH 4/7] [DE] Fix bug 54293 --- apps/documenteditor/main/app/view/FormSettings.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 440628125..9c5d59d85 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -216,14 +216,20 @@ define([ this.chAutofit = new Common.UI.CheckBox({ el: $markup.findById('#form-chb-autofit'), - labelText: this.textAutofit + labelText: this.textAutofit, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chAutofit.on('change', this.onChAutofit.bind(this)); this.lockedControls.push(this.chAutofit); this.chMulti = new Common.UI.CheckBox({ el: $markup.findById('#form-chb-multiline'), - labelText: this.textMulti + labelText: this.textMulti, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chMulti.on('change', this.onChMulti.bind(this)); this.lockedControls.push(this.chMulti); From 238470577ea278e0ce39213a266e6cc53e8e02b5 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Dec 2021 16:36:34 +0300 Subject: [PATCH 5/7] [DE] Fix bug 54294 --- apps/documenteditor/main/app/view/FormSettings.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 9c5d59d85..6cb44f102 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -411,7 +411,10 @@ define([ this.chAspect = new Common.UI.CheckBox({ el: $markup.findById('#form-chb-aspect'), - labelText: this.textAspect + labelText: this.textAspect, + dataHint: '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.chAspect.on('change', this.onChAspect.bind(this)); this.lockedControls.push(this.chAspect); @@ -424,7 +427,10 @@ define([ data: [{ displayValue: this.textAlways, value: Asc.c_oAscPictureFormScaleFlag.Always }, { displayValue: this.textNever, value: Asc.c_oAscPictureFormScaleFlag.Never }, { displayValue: this.textTooBig, value: Asc.c_oAscPictureFormScaleFlag.Bigger }, - { displayValue: this.textTooSmall, value: Asc.c_oAscPictureFormScaleFlag.Smaller }] + { displayValue: this.textTooSmall, value: Asc.c_oAscPictureFormScaleFlag.Smaller }], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'big' }); this.cmbScale.setValue(Asc.c_oAscPictureFormScaleFlag.Always); this.lockedControls.push(this.cmbScale); From d7cdb4f2aed5a5b6c2f43ee1ace702f6b42cc836 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Dec 2021 16:45:12 +0300 Subject: [PATCH 6/7] [DE PE SSE] Fix bug 54321 --- apps/common/main/lib/component/HintManager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index b96cde2d2..bbe807a2f 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -509,7 +509,8 @@ Common.UI.HintManager = new(function() { } if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' || curr.closest('.btn-slot').prop('id') === 'slot-btn-mode' || curr.prop('id') === 'btn-favorite' || curr.parent().prop('id') === 'tlb-box-users' || - curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about') { + curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about' || + curr.prop('id') === 'left-btn-support') { _resetToDefault(); return; } From 65e7b0cf475eca9ef17cf5b57e9c0d151947cc8a Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Dec 2021 17:08:41 +0300 Subject: [PATCH 7/7] [DE PE SSE] Fix bug 54253 --- apps/documenteditor/main/app/view/FileMenuPanels.js | 2 +- apps/presentationeditor/main/app/view/FileMenuPanels.js | 2 +- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 9b93c105d..54a9acbde 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1169,7 +1169,7 @@ define([ this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 8e2d1c1ed..3539d06ff 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -994,7 +994,7 @@ define([ this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 98faa8010..2701f9656 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1957,7 +1957,7 @@ define([ this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target);