Commit 56e794da by Kim Eunchul

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

#40726 【TECSS Web 1.9.2.6】空欄検索で何も検索されない

See merge request abook_web/web-viewer!56
parents 02a0bda0 1e6c1e33
...@@ -1159,7 +1159,12 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1159,7 +1159,12 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
} }
}catch(error){ }catch(error){
searchText = "invaildsearchtextzeroresultfound"; if(searchText == ''){
searchText = "invaildsearchtextzeroresultfoundinempty";
}else{
searchText = "invaildsearchtextzeroresultfound";
}
} }
} }
if(count > 5){ if(count > 5){
......
...@@ -271,7 +271,7 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -271,7 +271,7 @@ HEADER.searchHeaderButtonFunction = function(){
return; return;
} }
if ($('#searchbox-key').val() != ' ' && $('#searchbox-key').val() != '"or"' && $('#searchbox-key').val() != '"OR"' && $('#searchbox-key').val() != '"Or"'&& $('#searchbox-key').val() != '"oR"') { if ($('#searchbox-key').val() != ' ' && $('#searchbox-key').val() != '"or"' && $('#searchbox-key').val() != '"OR"' && $('#searchbox-key').val() != '"Or"' && $('#searchbox-key').val() != '"oR"' && $('#searchbox-key').val() != '') {
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