extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-30 22:51:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

not overwriting call and apply method of egw function/object using callFunc and applyFunc instead, fixes several problems

Browse Source
This commit is contained in:
Ralf Becker
2021-03-02 12:16:47 +02:00
parent 89d6dc8650
commit 7a060b205b
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/js/jsapi/egw_json.js
View File

@ -484,30 +484,27 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
/**
* Call a function specified by it's name (possibly dot separated, eg. "app.myapp.myfunc")
*
* @param {string} _func dot-separated function name
* @param {string|Function} _func dot-separated function name or function
* @param {mixed} ...args variable number of arguments
* @returns {mixed|Promise}
*/
call: function(_func)
callFunc: function(_func)
{
let args = [].slice.call(arguments); // convert arguments to array
let func = args.shift();
return this.apply(func, args);
return this.applyFunc(_func, [].slice.call(arguments, 1));
},
/**
* Call a function specified by it's name (possibly dot separated, eg. "app.myapp.myfunc")
*
* @param {string} _func dot-separated function name
* @param {string|Function} _func dot-separated function name or function
* @param {array} args arguments
* @param {object} _context
* @returns {mixed|Promise}
*/
apply: function(_func, args, _context)
applyFunc: function(_func, args, _context)
{
let parent = _context || window;
let func;
let func = _func;
if (typeof _func === 'string')
{
@ -713,7 +710,7 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
json.registerJSONPlugin(function(type, res, req) {
if (typeof res.data.func == 'string')
{
req.egw.apply(res.data.func, res.data.parms, req.egw.window);
req.egw.applyFunc(res.data.func, res.data.parms, req.egw.window);
return true;
}
throw 'Invalid parameters';