Commit 02a0bda0 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!55
parents 43b189c7 0363bbec
...@@ -1043,7 +1043,7 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1043,7 +1043,7 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
return; return;
} }
if ($('#txtSearchWs').val() != ' ') { if ($('#txtSearchWs').val() != ' ' && $('#txtSearchWs').val() != '"or"' && $('#txtSearchWs').val() != '"OR"'&& $('#txtSearchWs').val() != '"Or"'&& $('#txtSearchWs').val() != '"oR"') {
try{ try{
//seperate string //seperate string
var myRegexp = /[^\s"]+|"([^"]*)"/gi; var myRegexp = /[^\s"]+|"([^"]*)"/gi;
......
...@@ -271,7 +271,7 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -271,7 +271,7 @@ HEADER.searchHeaderButtonFunction = function(){
return; return;
} }
if ($('#searchbox-key').val() != ' ') { if ($('#searchbox-key').val() != ' ' && $('#searchbox-key').val() != '"or"' && $('#searchbox-key').val() != '"OR"' && $('#searchbox-key').val() != '"Or"'&& $('#searchbox-key').val() != '"oR"') {
try{ try{
//seperate string //seperate string
var myRegexp = /[^\s"]+|"([^"]*)"/gi; var myRegexp = /[^\s"]+|"([^"]*)"/gi;
......
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