diff options
| author | Kulanthaivel Palanichamy <kulanthaivel@codeaurora.org> | 2015-04-16 18:01:56 -0700 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:46 +0200 |
| commit | f210f91d773da892cb4d4a53467a41a06301d237 (patch) | |
| tree | 9ddd236c1eb5883f1af224564565d898aa5f24de | |
| parent | 4a6838a6f0e18018663b6ecd69559090ef25cd73 (diff) | |
| download | android_packages_apps_Gello-f210f91d773da892cb4d4a53467a41a06301d237.tar.gz android_packages_apps_Gello-f210f91d773da892cb4d4a53467a41a06301d237.tar.bz2 android_packages_apps_Gello-f210f91d773da892cb4d4a53467a41a06301d237.zip | |
Fix for WML postfield variable resolution issue
SWE-4364
| -rwxr-xr-x | assets/wml/swe_wml.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/assets/wml/swe_wml.js b/assets/wml/swe_wml.js index 9b350232..2a5967ee 100755 --- a/assets/wml/swe_wml.js +++ b/assets/wml/swe_wml.js @@ -351,14 +351,19 @@ function substituteVariablesInURL(url) function substituteVariablesInPostfield(value) { - var pattern = /(\$\(([_a-z]{1}[_a-z0-9]*)([:]{1}((([e]{1})(scape)?)|(([n]{1})(oesc)?)|(([u]{1})(nesc)?)))?\))/gi; + var pattern1 = /(\$\(([_a-z]{1}[_a-z0-9]*)([:]{1}((([e]{1})(scape)?)|(([n]{1})(oesc)?)|(([u]{1})(nesc)?)))?\))/gi; + var pattern2 = /(\$([_a-zA-z]{1}[_a-zA-Z0-9]*))/g; var replacer = function () { var name = arguments[2]; // TODO: Do the URL escaping here console.log("substituteVariablesInPostfield() found variable : " + arguments[0]); return WMLBrowser.getVar(name); }; - return value.replace(pattern, replacer); + if (pattern1.test(value)) { + return value.replace(pattern1, replacer); + } else if (pattern2.test(value)) { + return value.replace(pattern2, replacer); + } } function refreshVariableInSelectElement(select) |