holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get legacy JS parser to understand functions that don't start with "app." and don't have brackets in the attribute.

Browse Source 
This covers widget or other non-app static functions (eg: et2_avatar.uploadAvatar_onFinish)
This commit is contained in:
nathangray 2020-04-23 11:33:24 -06:00
parent b7ec2a9b91
commit eaafd5eb1f
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/js/etemplate/et2_core_legacyJSFunctions.js
View File

@ -123,6 +123,28 @@
context = _widget.getDOMNode();
}
// Check to see if it's referring to an existing function with no arguments specified.
// If so, bind context & use it directly
var parts = _code.split(".");
var existing_func = parts.pop();
var parent = _widget.egw().window;
for(var i=0; i < parts.length; ++i)
{
if (typeof parent[parts[i]] !== "undefined")
{
parent = parent[parts[i]];
}
// Nope
else
{
break;
}
}
if (typeof parent[existing_func] === "function")
{
return parent[existing_func].bind(context);
}
// Generate the function itself, if it fails, log the error message and
// return a function which always returns false
try {

3
api/js/etemplate/et2_widget_file.js
View File

@ -481,9 +481,6 @@ var et2_file = /** @class */ (function (_super) {
if (typeof this.onFinishOne == 'function') {
this.onFinishOne(event, response, name);
}
else if (this.options.onFinishOne) {
et2_call(this.options.onFinishOne, event, response, name);
}
return true;
};
/**

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

@ -665,14 +665,10 @@ export class et2_file extends et2_inputWidget
event.data = this;
// Callback
if(typeof this.onFinishOne == 'function' && !this.options.onFinishOne)
if(typeof this.onFinishOne == 'function')
{
this.onFinishOne(event, response, name);
}
else if (this.options.onFinishOne)
{
et2_call(this.options.onFinishOne,event,response,name);
}
return true;
}