extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-04 17:21:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tree / Action changes

Browse Source 
- Remove dragover action handling, it takes too much time and we do nothing with it (use dragenter)
- Fix unregistering actions did not remove eventListeners
- Fix multiple binding of actions in Et2Tree
This commit is contained in:
nathan 2024-07-04 13:28:14 -06:00
parent 29c0129731
commit 96877abde6
4 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/js/egw_action/EgwActionObjectInterface.ts
View File

@ -23,6 +23,7 @@ export interface EgwActionObjectInterface {
//properties
id?:string
_state: number;
handlers : { [type : string]? : [{ type : string, listener : Function }] };
stateChangeCallback: Function;
stateChangeContext: any;
reconnectActionsCallback: Function;

25
api/js/egw_action/EgwDropActionImplementation.ts
View File

@ -9,7 +9,7 @@
*/
import {EgwActionImplementation} from "./EgwActionImplementation";
import {EGW_AI_DRAG_ENTER, EGW_AI_DRAG_OUT, EGW_AI_DRAG_OVER, EGW_AO_EXEC_THIS} from "./egw_action_constants";
import {EGW_AI_DRAG_ENTER, EGW_AI_DRAG_OUT, EGW_AO_EXEC_THIS} from "./egw_action_constants";
import {egw_getObjectManager} from "./egw_action";
import {getPopupImplementation} from "./EgwPopupActionImplementation";
@ -24,21 +24,17 @@ export class EgwDropActionImplementation implements EgwActionImplementation {
const node = _aoi.getDOMNode() && _aoi.getDOMNode()[0] ? _aoi.getDOMNode()[0] : _aoi.getDOMNode();
const self:EgwDropActionImplementation = this;
if (node) {
node.classList.add('et2dropzone');
if(typeof _aoi.handlers == "undefined")
{
_aoi.handlers = {};
}
_aoi.handlers[this.type] = [];
node.classList.add('et2dropzone');
const dragover = (event)=> {
if (event.preventDefault) {
event.preventDefault();
}
if (!this.getTheDraggedDOM()) return;
const data = {
event: event,
ui: this.getTheDraggedData()
};
_aoi.triggerEvent(EGW_AI_DRAG_OVER, data);
return true;
};
const dragenter = function (event) {
@ -192,12 +188,16 @@ export class EgwDropActionImplementation implements EgwActionImplementation {
// DND Event listeners
node.addEventListener('dragover', dragover, false);
_aoi.handlers[this.type].push({type: 'dragover', listener: dragover});
node.addEventListener('dragenter', dragenter, false);
_aoi.handlers[this.type].push({type: 'dragenter', listener: dragenter});
node.addEventListener('drop', drop, false);
_aoi.handlers[this.type].push({type: 'drop', listener: drop});
node.addEventListener('dragleave', dragleave, false);
_aoi.handlers[this.type].push({type: 'dragleave', listener: dragleave});
return true;
}
@ -210,6 +210,9 @@ export class EgwDropActionImplementation implements EgwActionImplementation {
if (node) {
node.classList.remove('et2dropzone');
}
// Unregister handlers
_aoi.handlers[this.type]?.forEach(h => node.removeEventListener(h.type, h.listener));
delete _aoi.handlers[this.type];
return true;
};

31
api/js/egw_action/egwDragActionImplementation.ts
View File

@ -129,7 +129,12 @@ export class EgwDragActionImplementation implements EgwActionImplementation {
const node = _aoi.getDOMNode() && _aoi.getDOMNode()[0] ? _aoi.getDOMNode()[0] : _aoi.getDOMNode();
if (node) {
// Prevent selection
if(typeof _aoi.handlers == "undefined")
{
_aoi.handlers = {};
}
_aoi.handlers[this.type] = [];
// Prevent selection
node.onselectstart = function () {
return false;
};
@ -150,19 +155,26 @@ export class EgwDragActionImplementation implements EgwActionImplementation {
//jQuery(node).off("mousedown",egwPreventSelect)
//et2_dataview_view_aoi binds mousedown event in et2_dataview_rowAOI to "egwPreventSelect" function from egw_action_common via addEventListener
//node.removeEventListener("mousedown",egwPreventSelect)
node.addEventListener("mousedown", (event) => {
const mousedown = (event) =>
{
if (_context.isSelection(event)) {
node.setAttribute("draggable", false);
} else if (event.which != 3) {
document.getSelection().removeAllRanges();
}
})
node.addEventListener("mouseup", (event) => {
};
node.addEventListener("mousedown", mousedown)
_aoi.handlers[this.type].push({type: 'mousedown', listener: mousedown});
const mouseup = (event) =>
{
node.setAttribute("draggable", true);
// Set cursor back to auto. Seems FF can't handle cursor reversion
document.body.style.cursor = 'auto'
})
// Set cursor back to auto. Seems FF can't handle cursor reversion
document.body.style.cursor = 'auto'
};
node.addEventListener("mouseup", mouseup)
_aoi.handlers[this.type].push({type: 'mousedown', listener: mousedown});
node.setAttribute('draggable', true);
@ -280,7 +292,9 @@ export class EgwDragActionImplementation implements EgwActionImplementation {
// Drag Event listeners
node.addEventListener('dragstart', dragstart, false);
_aoi.handlers[this.type].push({type: 'dragstart', listener: dragstart});
node.addEventListener('dragend', dragend, false);
_aoi.handlers[this.type].push({type: 'dragend', listener: dragend});
return true;
@ -294,6 +308,9 @@ export class EgwDragActionImplementation implements EgwActionImplementation {
if (node) {
node.setAttribute('draggable', "false");
}
// Unregister handlers
_aoi.handlers[this.type]?.forEach(h => node.removeEventListener(h.type, h.listener));
delete _aoi.handlers[this.type];
return true;
};

1
api/js/etemplate/Et2Tree/Et2Tree.ts
View File

@ -351,7 +351,6 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement)
if(new_options?.length)
{
this._selectOptions = new_options;
this.updateComplete.then(()=>this._link_actions(this.actions))
}
}