haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Calc: fix drop zone indicator regression 

with cbf452b03d drop
indicator was not shown if the cursor is over the <div> elements
that inside the tabs

- fix by using e.currentTarget instead of e.target
and do some checks while on _handleDragLeave

Signed-off-by: Bayram Çiçek <bayram.cicek@collabora.com>
Change-Id: Iec8e246f18e553487b0eb0d9264cff8bb37b6305
pull/8799/head
Bayram Çiçek 2024-03-28 11:12:04 +03:00 committed by pedropintosilva
parent b878363899
commit 99cb267661
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/css/spreadsheet.css
View File

@ -288,7 +288,6 @@
vertical-align: bottom;
display: inline-block;
background-color: var(--color-main-background);
padding-bottom: 5px;
}
.tab-drop-area-active {

9
browser/src/control/Control.Tabs.js
View File

@ -440,13 +440,14 @@ L.Control.Tabs = L.Control.extend({
// support duplication with ctrl in the future.
e.dataTransfer.dropEffect = 'move';
e.target.previousElementSibling.classList.add('tab-drop-area-active');
e.currentTarget.previousElementSibling.classList.add('tab-drop-area-active');
return false;
},
_handleDragLeave: function (e) {
e.target.previousElementSibling.classList.remove('tab-drop-area-active');
if ($(e.target).hasClass('spreadsheet-tab') || (e.target.getAttribute('id') == 'drop-zone-end-container'))
e.currentTarget.previousElementSibling.classList.remove('tab-drop-area-active');
},
_handleDrop: function(e) {
@ -454,13 +455,13 @@ L.Control.Tabs = L.Control.extend({
e.stopPropagation();
}
e.target.previousElementSibling.classList.remove('tab-drop-area-active');
e.currentTarget.previousElementSibling.classList.remove('tab-drop-area-active');
var targetIndex = this._map._docLayer._partNames.indexOf(e.target.innerText);
this._moveSheet(targetIndex + 1); // drop to left side of the tab
},
_handleDragEnd: function (e) {
e.target.previousElementSibling.classList.remove('tab-drop-area-active');
e.currentTarget.previousElementSibling.classList.remove('tab-drop-area-active');
}
});