#39714 andやor検索(ウェブ版error処理)

abvw/js/contentview.js

@@ -736,6 +736,7 @@ CONTENTVIEW.searchHandle = function() {
     }
 
     if ($('#txtSearch').val() != '') {
+        try{
             var dataStored = CONTENTVIEW_GENERAL.arrThumbnailsLoaded;
             var contentPage = CONTENTVIEW_GENERAL.dataWebContentPage.pages;
             var myRegExp = new RegExp($('#txtSearch').val());
@@ -754,7 +755,6 @@ CONTENTVIEW.searchHandle = function() {
                 if (match != null)
                 {
                     myArray.push(match[1] ? match[1] : match[0]);
-                console.log(myArray);
                 }
             } while (match != null);
 
@@ -808,6 +808,11 @@ CONTENTVIEW.searchHandle = function() {
                 }
             }
 
+        }catch(error){
+            alert('正しくない検索です');
+            return;        
+        }
+
         if (sPageNo.length > 0) {
             //title start
             $('#bookmarkBoxHdSearching').children().remove();

abvw/js/contentview_Events.js

 
 //名前空間用のオブジェクトを用意する
 var CONTENTVIEW_EVENTS = {};
+CONTENTVIEW_EVENTS.click = true;
 
 /* add memo click */
 CONTENTVIEW_EVENTS.handleAddMemo = function(event) {
@@ -255,12 +256,26 @@ CONTENTVIEW_EVENTS.closeCopyTextBox = function() {
     $("#overlay").hide();
 };
 
+CONTENTVIEW_EVENTS.overClick = function() {
+	if (CONTENTVIEW_EVENTS.click) {
+        CONTENTVIEW_EVENTS.click = !CONTENTVIEW_EVENTS.click;
+	   
+	   // prevent clicking for 2 sec 
+	   setTimeout(function () {
+		CONTENTVIEW_EVENTS.click = true;
+	   }, 1000)
+	   return false;
+
+	} else {
+	   return true;
+	}
+}
 
 /*event click show dialog search*/
 CONTENTVIEW_EVENTS.showListSearchResult = function() {
     $('#txtSearch').keydown(function (e) {
         if (e.keyCode == 13) {
-            if(CONTENTSEARCH.overClick()){
+            if(CONTENTVIEW_EVENTS.overClick()){
                 return;
             }