Commit 9afd00a1 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 35340

parent 66199d74
...@@ -1558,7 +1558,7 @@ ...@@ -1558,7 +1558,7 @@
} }
var string1 = arg0.getValue(), string2 = arg1.getValue(), valueForSearching = string1 var string1 = arg0.getValue(), string2 = arg1.getValue(), valueForSearching = string1
.replace(/(\\)/g, "\\") .replace(/(\\)/g, "\\\\")
.replace(/(\^)/g, "\\^") .replace(/(\^)/g, "\\^")
.replace(/(\()/g, "\\(") .replace(/(\()/g, "\\(")
.replace(/(\))/g, "\\)") .replace(/(\))/g, "\\)")
...@@ -1568,6 +1568,7 @@ ...@@ -1568,6 +1568,7 @@
.replace(/(\{)/g, "\\{") .replace(/(\{)/g, "\\{")
.replace(/(\})/g, "\\}") .replace(/(\})/g, "\\}")
.replace(/(\$)/g, "\\$") .replace(/(\$)/g, "\\$")
.replace(/(\.)/g, "\\.")
.replace(/(~)?\*/g, function ($0, $1) { .replace(/(~)?\*/g, function ($0, $1) {
return $1 ? $0 : '(.*)'; return $1 ? $0 : '(.*)';
}) })
...@@ -1576,7 +1577,7 @@ ...@@ -1576,7 +1577,7 @@
}) })
.replace(/(~\*)/g, "\\*").replace(/(~\?)/g, "\\?"); .replace(/(~\*)/g, "\\*").replace(/(~\?)/g, "\\?");
valueForSearching = new RegExp(valueForSearching, "ig"); valueForSearching = new RegExp(valueForSearching, "ig");
if (string1 == "") { if ('' === string1) {
return this.value = arg2; return this.value = arg2;
} }
......
...@@ -11129,13 +11129,14 @@ ...@@ -11129,13 +11129,14 @@
.replace(/(\+)/g, "\\+").replace(/(\[)/g, "\\[") .replace(/(\+)/g, "\\+").replace(/(\[)/g, "\\[")
.replace(/(\])/g, "\\]").replace(/(\{)/g, "\\{") .replace(/(\])/g, "\\]").replace(/(\{)/g, "\\{")
.replace(/(\})/g, "\\}").replace(/(\$)/g, "\\$") .replace(/(\})/g, "\\}").replace(/(\$)/g, "\\$")
.replace(/(\.)/g, "\\.")
.replace(/(~)?\*/g, function ($0, $1) { .replace(/(~)?\*/g, function ($0, $1) {
return $1 ? $0 : '(.*)'; return $1 ? $0 : '(.*)';
}) })
.replace(/(~)?\?/g, function ($0, $1) { .replace(/(~)?\?/g, function ($0, $1) {
return $1 ? $0 : '.'; return $1 ? $0 : '.';
}) })
.replace(/(~\*)/g, "\\*").replace(/(~\?)/g, "\\?").replace(/(\.)/g, "\\."); .replace(/(~\*)/g, "\\*").replace(/(~\?)/g, "\\?");
valueForSearching = new RegExp(valueForSearching, findFlags); valueForSearching = new RegExp(valueForSearching, findFlags);
options.indexInArray = 0; options.indexInArray = 0;
......
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