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

Merge pull request #1274 from ONLYOFFICE/fix/drag-and-drop

Browse source 
Fix/drag and drop
This commit is contained in:
Julia Radzhabova 2021-10-26 18:44:10 +03:00 committed by GitHub
parent ed68ebbd59 b225d5e196
commit e743fb7412
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,9 +177,14 @@ define([
lockDrag = true;
}
});
if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1 || this.bar.isEditFormula) {
if (((this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) && !(e.ctrlKey || e.metaKey)) || this.bar.isEditFormula) {
lockDrag = true;
}
// move last selected sheet if all sheets are selected
if (this.bar.selectTabs.length === this.bar.tabs.length && this.bar.tabs.length > 1 && !e.ctrlKey && !e.metaKey) {
lockDrag = false;
this.bar.$el.find('ul > li.selected').removeClass('selected');
}
this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag);
if (!lockDrag && !e.ctrlKey && !e.metaKey) {
tab.changeState();