Commit f69301da by Kim Eunchul

#40365 【TECSS(Biz) webviewer 1.9】一覧画面で検索時にエラーを起こすキーワードがある

parent 7d27facd
...@@ -1052,15 +1052,16 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1052,15 +1052,16 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
var myArray = []; var myArray = [];
var myQuery; var myQuery;
var myRegExpArr = []; var myRegExpArr = [];
var textReg = $('#txtSearchWs').val().replace("%", "\\%");
do { do {
var match = myRegexp.exec($('#txtSearchWs').val()); var match = myRegexp.exec(textReg);
if (match != null) if (match != null)
{ {
myArray.push(match[1] ? match[1] : match[0]); myArray.push(match[1] ? match[1] : match[0]);
} }
} while (match != null); } while (match != null);
console.log(myArray);
if(myArray[0].charAt(0) == "("){ if(myArray[0].charAt(0) == "("){
if(myArray[0] == "("){ if(myArray[0] == "("){
myRegExpArr[1] = new RegExp(myArray[1]); myRegExpArr[1] = new RegExp(myArray[1]);
......
...@@ -758,7 +758,7 @@ CONTENTVIEW.searchHandle = function() { ...@@ -758,7 +758,7 @@ CONTENTVIEW.searchHandle = function() {
myArray.push(match[1] ? match[1] : match[0]); myArray.push(match[1] ? match[1] : match[0]);
} }
} while (match != null); } while (match != null);
console.log(myArray);
if(myArray[0].charAt(0) == "("){ if(myArray[0].charAt(0) == "("){
if(myArray[0] == "("){ if(myArray[0] == "("){
myRegExpArr[1] = new RegExp(myArray[1]); myRegExpArr[1] = new RegExp(myArray[1]);
......
...@@ -278,15 +278,16 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -278,15 +278,16 @@ HEADER.searchHeaderButtonFunction = function(){
var myQuery; var myQuery;
var myRegExpArr = []; var myRegExpArr = [];
var count = 0; var count = 0;
var textReg = $('#searchbox-key').val().replace("%", "\\%");
do { do {
var match = myRegexp.exec($('#searchbox-key').val()); var match = myRegexp.exec(textReg);
if (match != null) if (match != null)
{ {
myArray.push(match[1] ? match[1] : match[0]); myArray.push(match[1] ? match[1] : match[0]);
} }
} while (match != null); } while (match != null);
console.log(myArray);
if(myArray[0].charAt(0) == "("){ if(myArray[0].charAt(0) == "("){
if(myArray[0] == "("){ if(myArray[0] == "("){
myRegExpArr[1] = new RegExp(myArray[1]); myRegExpArr[1] = new RegExp(myArray[1]);
......
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