Commit 4be64f16 authored by CardBook's avatar CardBook Committed by GitHub

Merge pull request #246 from abak19/master

allow escaped vertical bar in fnFormula
parents 9451b879 771574bd
......@@ -414,7 +414,7 @@ if ("undefined" == typeof(cardbookUtils)) {
},
escapeString1: function (vString) {
return vString.replace(/\\\(/g,"@ESCAPEDLEFTPARENTHESIS@").replace(/\\\)/g,"@ESCAPEDRIGHTPARENTHESIS@");
return vString.replace(/\\\(/g,"@ESCAPEDLEFTPARENTHESIS@").replace(/\\\)/g,"@ESCAPEDRIGHTPARENTHESIS@").replace(/\\\|/g,"@ESCAPEDPIPE@");
},
escapeArray: function (vArray) {
......@@ -483,7 +483,7 @@ if ("undefined" == typeof(cardbookUtils)) {
},
unescapeString1: function (vString) {
return vString.replace(/@ESCAPEDLEFTPARENTHESIS@/g,"(").replace(/@ESCAPEDRIGHTPARENTHESIS@/g,")");
return vString.replace(/@ESCAPEDLEFTPARENTHESIS@/g,"(").replace(/@ESCAPEDRIGHTPARENTHESIS@/g,")").replace(/@ESCAPEDPIPE@/g,"|");
},
unescapeArray: function (vArray) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment