extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-30 18:49:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully fix context for action system applyFunc call

Browse Source
This commit is contained in:
ralf 2022-10-10 18:08:56 +02:00
parent 55f1c2a53b
commit 006199a199
1 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
api/js/egw_action/egw_action_common.js
View File

@ -367,60 +367,18 @@ egwFnct.prototype.setValue = function(_value)
{ {
this.fnct = _value; this.fnct = _value;
} }
else if (typeof _value == "string" && _value.substring(0, 11) === 'javaScript:')
// Global function (on window)
else if (typeof _value == "string" &&
_value.substr(0,11) == "javaScript:" &&
typeof window[_value.substr(11)] == "function")
{ {
this.fnct = window[_value.substr(11)]; this.fnct = function()
console.log("Global function is bad!", _value); {
const manager = this.context && this.context.getManager ? this.context.getManager() : null;
return egw.applyFunc(_value.substring(11), arguments, (manager ? manager.data.context : null) || window);
}
} }
else if (this.acceptedTypes.indexOf(typeof _value) >= 0) else if (this.acceptedTypes.indexOf(typeof _value) >= 0)
{ {
this.value = _value; this.value = _value;
} }
// egw application specific function
else if (typeof _value === "string" &&
_value.substr(0,15) === "javaScript:app." && app)
{
var parts = _value.split(".");
var existing_func = parts.pop();
var manager = this.context && this.context.getManager ? this.context.getManager() : null;
var parent = (manager ? manager.data.context : null) || window.app;
for (var i = 1; i < parts.length; ++i) {
if (typeof parent[parts[i]] !== "undefined") {
parent = parent[parts[i]];
}
// check if we need a not yet included app.js object --> include it now and re-set when it arrives
else if (i === 1 && typeof app.classes[parts[1]] === "undefined")
{
return import(egw.webserverUrl+"/"+parts[1]+"/js/app.min.js?"+((new Date).valueOf()/86400|0).toString())
.then(() => {
if(typeof app.classes[parts[i]] === "undefined")
{
throw new Error("app.classes."+parts[i]+" not found!");
}
this.setValue(_value);
});
}
// check if we need a not yet instantiated app.js object --> instantiate it now
else if (i === 1 && typeof app.classes[parts[1]] === "function")
{
parent = parent[parts[1]] = new app.classes[parts[1]]();
}
// Nope
else {
break;
}
}
if (typeof parent[existing_func] === "function") {
this.fnct = parent[existing_func];
this.context = parent;
}
}
// Something, but could not figure it out // Something, but could not figure it out
else if (_value) else if (_value)
{ {
@ -560,4 +518,3 @@ export function sprintf() {
} }
return o.join(''); return o.join('');
} }