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

Merge pull request #434 from ONLYOFFICE/fix/Bug_45952

Browse source 
Fix/bug 45952
This commit is contained in:
Julia Radzhabova 2020-07-27 19:01:09 +03:00 committed by GitHub
parent db341276be a1d7986157
commit 15f86a113a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/TabBar.js
View file

@ -241,7 +241,7 @@ define([
lockDrag = true; lockDrag = true;
} }
}); });
if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) { if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1 || this.bar.isEditFormula) {
lockDrag = true; lockDrag = true;
} }
this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag); this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag);

3
apps/spreadsheeteditor/main/app/controller/Statusbar.js
View file

@ -208,11 +208,14 @@ define([
statusbar = this.statusbar; statusbar = this.statusbar;
statusbar.isEditFormula = disableAdd; statusbar.isEditFormula = disableAdd;
statusbar.tabbar && (statusbar.tabbar.isEditFormula = disableAdd);
statusbar.btnZoomUp.setDisabled(disable); statusbar.btnZoomUp.setDisabled(disable);
statusbar.btnZoomDown.setDisabled(disable); statusbar.btnZoomDown.setDisabled(disable);
statusbar.labelZoom[disable?'addClass':'removeClass']('disabled'); statusbar.labelZoom[disable?'addClass':'removeClass']('disabled');
statusbar.btnAddWorksheet.setDisabled(disable || this.api.asc_isWorkbookLocked() || statusbar.rangeSelectionMode!=Asc.c_oAscSelectionDialogType.None); statusbar.btnAddWorksheet.setDisabled(disable || this.api.asc_isWorkbookLocked() || statusbar.rangeSelectionMode!=Asc.c_oAscSelectionDialogType.None);
statusbar.$el.find('#statusbar_bottom li span').attr('oo_editor_input', !disableAdd);
if (disableAdd && mask.length>0 || !disableAdd && mask.length==0) return; if (disableAdd && mask.length>0 || !disableAdd && mask.length==0) return;
statusbar.$el.find('.statusbar').toggleClass('masked', disableAdd); statusbar.$el.find('.statusbar').toggleClass('masked', disableAdd);
if(disableAdd) { if(disableAdd) {

7
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -246,10 +246,17 @@
&.mousemove { &.mousemove {
&:first-child {
> span {
padding-left: 8px;
}
}
> span { > span {
border-left: 2px solid @gray-deep; border-left: 2px solid @gray-deep;
padding-left: 9px; padding-left: 9px;
} }
&.right { &.right {
> span { > span {
border-left: 1px solid @gray-dark; border-left: 1px solid @gray-dark;