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

abvw/js/contentsearch.js

@@ -1159,8 +1159,13 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 			}
 			}
 
 
 		}catch(error){
 		}catch(error){
+			if(searchText == ''){
+				searchText = "invaildsearchtextzeroresultfoundinempty";
+			}else{
 				searchText = "invaildsearchtextzeroresultfound";
 				searchText = "invaildsearchtextzeroresultfound";
 			}
 			}
+			
+		}
 	}
 	}
 	if(count > 5){
 	if(count > 5){
 		alert('語句数は最大5つです');
 		alert('語句数は最大5つです');

abvw/js/header.js

@@ -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;