Commit a8ca3a66 by Kim Eunchul

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

parent 8b22dfd8
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
"txtTextCopy":"Copy Body Text", "txtTextCopy":"Copy Body Text",
"txtNoTextCopy":"No Text", "txtNoTextCopy":"No Text",
"txtNoSearchResult":"No Result", "txtNoSearchResult":"No Result",
"txtErrorSearchResult":"No Result",
"msgShioriNotExists":"no Bookmark", "msgShioriNotExists":"no Bookmark",
"msgPwdChangeOK":"Success.", "msgPwdChangeOK":"Success.",
"msgPwdChangeNG":"Failed.<br/>Password requires at least both of character and numeric.", "msgPwdChangeNG":"Failed.<br/>Password requires at least both of character and numeric.",
......
...@@ -727,7 +727,7 @@ CONTENTVIEW.eventEnd_CopyText = function(e) { ...@@ -727,7 +727,7 @@ CONTENTVIEW.eventEnd_CopyText = function(e) {
/* search content */ /* search content */
CONTENTVIEW.searchHandle = function() { CONTENTVIEW.searchHandle = function() {
var w = $("#main").width() - $(".hdRcolumn").width(); var w = $("#main").width() - $(".hdRcolumn").width();
var searchText;
var pos = [w, CONTENTVIEW.marginY]; var pos = [w, CONTENTVIEW.marginY];
if($('#txtSearch').val().length > 200){ if($('#txtSearch').val().length > 200){
...@@ -827,6 +827,10 @@ CONTENTVIEW.searchHandle = function() { ...@@ -827,6 +827,10 @@ CONTENTVIEW.searchHandle = function() {
} }
} }
if($('#txtSearch').val() == "or" || $('#txtSearch').val() == "Or" || $('#txtSearch').val() == "oR" || $('#txtSearch').val() == "OR"){
myQuery = ' ||';
}
for (var nIndex = 0; nIndex < contentPage.length; nIndex++) { for (var nIndex = 0; nIndex < contentPage.length; nIndex++) {
if (eval(myQuery)) { if (eval(myQuery)) {
//searchResult.push(contentPage[nIndex]); //searchResult.push(contentPage[nIndex]);
...@@ -930,7 +934,11 @@ CONTENTVIEW.searchHandle = function() { ...@@ -930,7 +934,11 @@ CONTENTVIEW.searchHandle = function() {
} }
} else { } else {
$('#divSearchResult').children().remove(); $('#divSearchResult').children().remove();
if(searchText == "invaildsearchtextzeroresultfound"){
$('#divSearchResult').append('<span class="last">' + I18N.i18nText('txtErrorSearchResult') + '</span>');
}else{
$('#divSearchResult').append('<span class="last">' + I18N.i18nText('txtNoSearchResult') + '</span>'); $('#divSearchResult').append('<span class="last">' + I18N.i18nText('txtNoSearchResult') + '</span>');
}
//title start //title start
$('#bookmarkBoxHdSearching').children().remove(); $('#bookmarkBoxHdSearching').children().remove();
......
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