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

make parsing of arguments more robust

Browse Source
This commit is contained in:
Ralf Becker 2014-02-19 15:11:57 +00:00
parent b692346cce
commit d3f2b0a1f9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/templates/idots/js/idots.js
View File

@ -69,7 +69,12 @@ egw_LAB.wait(function() {
var args = []; var args = [];
if (matches.length > 1 && matches[2] !== undefined) if (matches.length > 1 && matches[2] !== undefined)
{ {
args = JSON.parse('['+matches[2].replace(/'/g,'"')+']'); try {
args = JSON.parse('['+matches[2]+']');
}
catch(e) { // deal with '-encloded strings (JSON allows only ")
args = JSON.parse('['+matches[2].replace(/','/g, '","').replace(/((^|,)'|'(,|$))/g, '$2"$3')+']');
}
} }
args.unshift(matches[1]); args.unshift(matches[1]);
return et2_call.apply(this, args); return et2_call.apply(this, args);