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

Merge branch 'release/v7.2.0' into fix/bug-45622

Browse source
This commit is contained in:
Julia Radzhabova 2022-07-11 19:06:06 +03:00
parent 8e6ad3b0c6 2dfad6b6fa
commit d1d3275331
6 changed files with 27 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);

1
apps/documenteditor/main/locale/en.json
View file

@ -1829,6 +1829,7 @@
"DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification",
"DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows",
"DE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace", "DE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace",
"DE.Views.FileMenuPanels.Settings.strShowOthersChanges": "Show changes from other users",
"DE.Views.FormSettings.textAlways": "Always", "DE.Views.FormSettings.textAlways": "Always",
"DE.Views.FormSettings.textAspect": "Lock aspect ratio", "DE.Views.FormSettings.textAspect": "Lock aspect ratio",
"DE.Views.FormSettings.textAtLeast": "At least", "DE.Views.FormSettings.textAtLeast": "At least",

1
apps/presentationeditor/main/locale/en.json
View file

@ -1690,6 +1690,7 @@
"PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification",
"PE.Views.FileMenuPanels.Settings.txtWin": "as Windows", "PE.Views.FileMenuPanels.Settings.txtWin": "as Windows",
"PE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace", "PE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace",
"PE.Views.FileMenuPanels.Settings.strShowOthersChanges": "Show changes from other users",
"PE.Views.HeaderFooterDialog.applyAllText": "Apply to all", "PE.Views.HeaderFooterDialog.applyAllText": "Apply to all",
"PE.Views.HeaderFooterDialog.applyText": "Apply", "PE.Views.HeaderFooterDialog.applyText": "Apply",
"PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.<br>To change the master, click 'Apply to all' instead of 'Apply'", "PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.<br>To change the master, click 'Apply to all' instead of 'Apply'",

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2214,6 +2214,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtZh": "Chinese", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtZh": "Chinese",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCalculating": "Calculating", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCalculating": "Calculating",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strDateFormat1904": "Use 1904 date system", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strDateFormat1904": "Use 1904 date system",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strShowOthersChanges": "Show changes from other users",
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning", "SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password", "SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password",
"SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Spreadsheet", "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Spreadsheet",

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 {