Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Bug 57756

Browse source
This commit is contained in:
JuliaSvinareva 2022-07-04 11:45:40 +03:00
parent 0d333bffc8
commit 094cb9989b
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/main/lib/controller/HintManager.js
View file

@ -464,11 +464,8 @@ Common.UI.HintManager = new(function() {
$(document).on('keyup', function(e) { $(document).on('keyup', function(e) {
if (_isScroll && (e.keyCode === Common.UI.Keys.UP || e.keyCode === Common.UI.Keys.DOWN)) { if (_isScroll && (e.keyCode === Common.UI.Keys.UP || e.keyCode === Common.UI.Keys.DOWN)) {
_isScroll = false; _isScroll = false;
_hideHints();
_currentHints.length = 0;
_currentControls.length = 0;
_showHints(); _showHints();
console.log($(':focus')); Common.NotificationCenter.trigger('hints:hover', false);
} else if (e.keyCode == Common.UI.Keys.ALT && _needShow && !(window.SSE && window.SSE.getController('Statusbar').getIsDragDrop())) { } else if (e.keyCode == Common.UI.Keys.ALT && _needShow && !(window.SSE && window.SSE.getController('Statusbar').getIsDragDrop())) {
e.preventDefault(); e.preventDefault();
if (!_hintVisible) { if (!_hintVisible) {
@ -492,8 +489,12 @@ Common.UI.HintManager = new(function() {
$(document).on('keydown', function(e) { $(document).on('keydown', function(e) {
if (_hintVisible) { if (_hintVisible) {
e.preventDefault(); e.preventDefault();
if (e.keyCode === Common.UI.Keys.UP || e.keyCode === Common.UI.Keys.DOWN) { if ($('#file-menu-panel').is(':visible') && _currentLevel === 2 && (e.keyCode === Common.UI.Keys.UP || e.keyCode === Common.UI.Keys.DOWN)) {
_hideHints();
_currentHints.length = 0;
_currentControls.length = 0;
_isScroll = true; _isScroll = true;
Common.NotificationCenter.trigger('hints:hover', true);
} else if (e.keyCode == Common.UI.Keys.ESC ) { } else if (e.keyCode == Common.UI.Keys.ESC ) {
setTimeout(function () { setTimeout(function () {
if (_currentLevel === 0) { if (_currentLevel === 0) {

8
apps/common/main/lib/mods/perfect-scrollbar.js
View file

@ -386,17 +386,21 @@
}; };
var bindKeyboardHandler = function () { var bindKeyboardHandler = function () {
var hovered = false; var hovered = false,
altHovered = false;
$this.bind('mouseenter' + eventClassName, function (e) { $this.bind('mouseenter' + eventClassName, function (e) {
hovered = true; hovered = true;
}); });
$this.bind('mouseleave' + eventClassName, function (e) { $this.bind('mouseleave' + eventClassName, function (e) {
hovered = false; hovered = false;
}); });
Common.NotificationCenter.on('hints:hover', function (isHover) {
altHovered = isHover;
});
var shouldPrevent = false; var shouldPrevent = false;
$(document).bind('keydown' + eventClassName, function (e) { $(document).bind('keydown' + eventClassName, function (e) {
if (!hovered || $(document.activeElement).is(":input,[contenteditable]")) { if ((!hovered && !altHovered) || $(document.activeElement).is(":input,[contenteditable]")) {
return; return;
} }

12
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -246,8 +246,8 @@ define([
menu: undefined, menu: undefined,
template: _.template([ template: _.template([
'<div class="flex-settings">', '<div class="flex-settings" tabindex="0">',
'<table class="oo" style="margin: 10px 14px 0;"><tbody>', '<table style="margin: 10px 14px 0;"><tbody>',
'<tr class="editsave">', '<tr class="editsave">',
'<td colspan="2" class="group-name top"><label><%= scope.txtEditingSaving %></label></td>', '<td colspan="2" class="group-name top"><label><%= scope.txtEditingSaving %></label></td>',
'</tr>', '</tr>',
@ -739,11 +739,9 @@ define([
this.updateSettings(); this.updateSettings();
this.updateScroller(); this.updateScroller();
var me = this; setTimeout(_.bind(function () {
setTimeout(function () { $(this.el).find('.ps-container')[0].focus();
$(me.el).find('.ps-container table')[0].focus(); }, this), 10);
console.log($(':focus'));
}, 300);
}, },
updateScroller: function() { updateScroller: function() {