extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 06:18:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix DnD to link file to entry

Browse Source
This commit is contained in:
nathan 2022-12-14 11:56:27 -07:00
parent 54498a005c
commit a832c12dbc
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/Et2Link/Et2LinkTo.ts
View File

@ -15,7 +15,6 @@ import {FormControlMixin, ValidateMixin} from "@lion/form-core";
import {css, html, LitElement, ScopedElementsMixin} from "@lion/core";
import {et2_createWidget, et2_widget} from "../et2_core_widget";
import {et2_file} from "../et2_widget_file";
import {et2_tabbox} from "../et2_widget_tabs";
import {Et2Button} from "../Et2Button/Et2Button";
import {Et2LinkEntry} from "./Et2LinkEntry";
import {egw} from "../../jsapi/egw_global";
@ -23,6 +22,7 @@ import {et2_vfsSelect} from "../et2_widget_vfs";
import {LinkInfo} from "./Et2Link";
import {ValidationType} from "@lion/form-core/types/validate/ValidateMixinTypes";
import {ManualMessage} from "../Validators/ManualMessage";
import {Et2Tabs} from "../Layout/Et2Tabs/Et2Tabs";
/**
* Choose an existing entry, VFS file or local file, and link it to the current entry.
@ -176,10 +176,10 @@ export class Et2LinkTo extends Et2InputWidget(ScopedElementsMixin(FormControlMix
{
tabs = tabs.getParent();
}
while(tabs != self.getRoot() && tabs.getType() != 'tabbox');
while(tabs != self.getRoot() && tabs.getType() != 'ET2-TABBOX');
if(tabs != self.getRoot())
{
(<et2_tabbox><unknown>tabs).activateTab(self);
(<Et2Tabs><unknown>tabs).activateTab(self);
}
return true;
},

9
api/js/etemplate/et2_widget_file.ts
View File

@ -245,7 +245,14 @@ export class et2_file extends et2_inputWidget
this.setDOMNode(this.node[0]);
// set drop target to widget dom node if no target option is specified
if (!this.options.drop_target) this.resumable.assignDrop([this.getDOMNode()]);
if(!this.options.drop_target)
{
this.resumable.assignDrop([this.getDOMNode()]);
}
else
{
this.set_drop_target(this.options.drop_target);
}
}
/**