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

Merge pull request #1848 from ONLYOFFICE/fix/fix-bugs

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2022-07-11 18:54:40 +03:00 committed by GitHub
parent 0ade982566 664daf1183
commit 2dfad6b6fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -603,7 +603,9 @@ Common.UI.HintManager = new(function() {
} }
} }
_needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-use-alt-key") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0); _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-use-alt-key") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT &&
!Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 &&
!(window.PE && $('#pe-preview').is(':visible')));
if (e.altKey && e.keyCode !== 115) { if (e.altKey && e.keyCode !== 115) {
e.preventDefault(); e.preventDefault();
} }

2
apps/common/main/lib/view/SearchPanel.js
View file

@ -253,11 +253,13 @@ define([
this.cmbLookIn.setValue(0); this.cmbLookIn.setValue(0);
var tableTemplate = '<div class="search-table">' + var tableTemplate = '<div class="search-table">' +
'<div class="header-items">' +
'<div class="header-item">' + this.textSheet + '</div>' + '<div class="header-item">' + this.textSheet + '</div>' +
'<div class="header-item">' + this.textName + '</div>' + '<div class="header-item">' + this.textName + '</div>' +
'<div class="header-item">' + this.textCell + '</div>' + '<div class="header-item">' + this.textCell + '</div>' +
'<div class="header-item">' + this.textValue + '</div>' + '<div class="header-item">' + this.textValue + '</div>' +
'<div class="header-item">' + this.textFormula + '</div>' + '<div class="header-item">' + this.textFormula + '</div>' +
'</div>' +
'<div class="ps-container oo search-items"></div>' + '<div class="ps-container oo search-items"></div>' +
'</div>', '</div>',
$resultTable = $(tableTemplate).appendTo(this.$resultsContainer); $resultTable = $(tableTemplate).appendTo(this.$resultsContainer);

33
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -759,20 +759,25 @@
height: 100%; height: 100%;
position: relative; position: relative;
} }
.header-item { .header-items {
width:16%; display: flex;
display: inline-block; .header-item {
height: 18px; width: 16%;
text-align: start; height: 18px;
font-weight: normal; text-align: start;
padding-left: 4px; font-weight: normal;
padding-top: 2px; padding-left: 4px;
&:not(:first-child) { padding-top: 2px;
border-left: @scaled-one-px-value-ie solid @border-divider-ie; overflow: hidden;
border-left: @scaled-one-px-value solid @border-divider; white-space: nowrap;
} text-overflow: ellipsis;
&:last-child { &:not(:first-child) {
width:36%; border-left: @scaled-one-px-value-ie solid @border-divider-ie;
border-left: @scaled-one-px-value solid @border-divider;
}
&:last-child {
width: 36%;
}
} }
} }
.search-items { .search-items {