Commit 43b189c7 by Kim Eunchul

Merge branch 'contract/ttss/1.0.0_kim-ec' into 'contract/ttss/1.1.0'

#40821 【TECSS Web 1.9.2.6】「or」「(」「半角スペース」で検索した時の結果が統一されていない

See merge request abook_web/web-viewer!54
parents 62d58fcc a2fde2ad
...@@ -1076,7 +1076,7 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1076,7 +1076,7 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
} }
for(var i = 0; i < dummyArray.length; i++){ for(var i = 0; i < dummyArray.length; i++){
if(dummyArray[i].includes(")(") && dummyArray[i].charAt(0) != "'" && dummyArray[i].charAt(dummyArray.length - 1) != "'"){ if(dummyArray[i].indexOf(")(") > 0 && dummyArray[i].charAt(0) != "'" && dummyArray[i].charAt(dummyArray.length - 1) != "'"){
searchText = ")"; searchText = ")";
} }
} }
......
...@@ -808,7 +808,7 @@ CONTENTVIEW.searchHandle = function() { ...@@ -808,7 +808,7 @@ CONTENTVIEW.searchHandle = function() {
} while (match != null); } while (match != null);
for(var i = 0; i < dummyArray.length; i++){ for(var i = 0; i < dummyArray.length; i++){
if(dummyArray[i].includes(")(") && dummyArray[i].charAt(0) != "'" && dummyArray[i].charAt(dummyArray.length - 1) != "'"){ if(dummyArray[i].indexOf(")(") > 0 && dummyArray[i].charAt(0) != "'" && dummyArray[i].charAt(dummyArray.length - 1) != "'"){
throw new Error('quotes error!'); throw new Error('quotes error!');
} }
} }
......
...@@ -378,7 +378,7 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -378,7 +378,7 @@ HEADER.searchHeaderButtonFunction = function(){
} }
for(var i = 0; i < dummyArray.length; i++){ for(var i = 0; i < dummyArray.length; i++){
if(dummyArray[i].includes(")(") && dummyArray[i].charAt(0) != "'" && dummyArray[i].charAt(dummyArray.length - 1) != "'"){ if(dummyArray[i].indexOf(")(") > 0 && dummyArray[i].charAt(0) != "'" && dummyArray[i].charAt(dummyArray.length - 1) != "'"){
myQuery += ' &&'; myQuery += ' &&';
} }
} }
......
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