소스 검색

fix #1400 suggestor.js check

Shinsuke Sugaya 7 년 전
부모
커밋
01d2e218e3
3개의 변경된 파일85개의 추가작업 그리고 81개의 파일을 삭제
  1. 27 26
      src/main/webapp/js/help.js
  2. 29 28
      src/main/webapp/js/index.js
  3. 29 27
      src/main/webapp/js/search.js

+ 27 - 26
src/main/webapp/js/help.js

@@ -26,30 +26,31 @@ $(function(){
 		return false;
 	});
 
-    $('#query').suggestor( {
-        ajaxinfo: {
-            url: contextPath + '/suggest',
-            fn: '_default,content,title',
-            num: 10,
-            lang: $('#langSearchOption').val()
-        },
-        boxCssInfo: {
-            border: '1px solid rgba(82, 168, 236, 0.5)',
-            '-webkit-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-            '-moz-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-            'box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-            'background-color': '#fff',
-            'z-index': '10000'
-        },
-        listSelectedCssInfo: {
-            'background-color': 'rgba(82, 168, 236, 0.1)'
-        },
-        listDeselectedCssInfo: {
-            'background-color': '#ffffff'
-        },
-        minterm: 1,
-        adjustWidthVal: 11,
-        searchForm: $('#searchForm')
-    });
-
+	if (typeof $.fn.suggestor === 'function') {
+	    $('#query').suggestor( {
+	        ajaxinfo: {
+	            url: contextPath + '/suggest',
+	            fn: '_default,content,title',
+	            num: 10,
+	            lang: $('#langSearchOption').val()
+	        },
+	        boxCssInfo: {
+	            border: '1px solid rgba(82, 168, 236, 0.5)',
+	            '-webkit-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+	            '-moz-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+	            'box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+	            'background-color': '#fff',
+	            'z-index': '10000'
+	        },
+	        listSelectedCssInfo: {
+	            'background-color': 'rgba(82, 168, 236, 0.1)'
+	        },
+	        listDeselectedCssInfo: {
+	            'background-color': '#ffffff'
+	        },
+	        minterm: 1,
+	        adjustWidthVal: 11,
+	        searchForm: $('#searchForm')
+	    });
+	}
 });

+ 29 - 28
src/main/webapp/js/index.js

@@ -34,32 +34,33 @@ $(function() {
 		return false;
 	});
 
-	$('#contentQuery')
-			.suggestor(
-					{
-						ajaxinfo : {
-							url : contextPath + '/suggest',
-							fn : '_default,content,title',
-							num : 10,
-							lang : $('#langSearchOption').val()
-						},
-						boxCssInfo : {
-							border : '1px solid rgba(82, 168, 236, 0.5)',
-							'-webkit-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-							'-moz-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-							'box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-							'background-color' : '#fff',
-							'z-index' : '10000'
-						},
-						listSelectedCssInfo : {
-							'background-color' : 'rgba(82, 168, 236, 0.1)'
-						},
-						listDeselectedCssInfo : {
-							'background-color' : '#ffffff'
-						},
-						minterm : 1,
-						adjustWidthVal : 11,
-						searchForm : $('#searchForm')
-					});
-
+	if (typeof $.fn.suggestor === 'function') {
+		$('#contentQuery')
+				.suggestor(
+						{
+							ajaxinfo : {
+								url : contextPath + '/suggest',
+								fn : '_default,content,title',
+								num : 10,
+								lang : $('#langSearchOption').val()
+							},
+							boxCssInfo : {
+								border : '1px solid rgba(82, 168, 236, 0.5)',
+								'-webkit-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+								'-moz-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+								'box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+								'background-color' : '#fff',
+								'z-index' : '10000'
+							},
+							listSelectedCssInfo : {
+								'background-color' : 'rgba(82, 168, 236, 0.1)'
+							},
+							listDeselectedCssInfo : {
+								'background-color' : '#ffffff'
+							},
+							minterm : 1,
+							adjustWidthVal : 11,
+							searchForm : $('#searchForm')
+						});
+	}
 });

+ 29 - 27
src/main/webapp/js/search.js

@@ -174,33 +174,35 @@ $(function() {
 		return false;
 	});
 
-	$('#query')
-			.suggestor(
-					{
-						ajaxinfo : {
-							url : contextPath + '/suggest',
-							fn : '_default,content,title',
-							num : 10,
-							lang : $('#langSearchOption').val()
-						},
-						boxCssInfo : {
-							border : '1px solid rgba(82, 168, 236, 0.5)',
-							'-webkit-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-							'-moz-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-							'box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
-							'background-color' : '#fff',
-							'z-index' : '10000'
-						},
-						listSelectedCssInfo : {
-							'background-color' : 'rgba(82, 168, 236, 0.1)'
-						},
-						listDeselectedCssInfo : {
-							'background-color' : '#ffffff'
-						},
-						minterm : 1,
-						adjustWidthVal : 11,
-						searchForm : $('#searchForm')
-					});
+	if (typeof $.fn.suggestor === 'function') {
+		$('#query')
+				.suggestor(
+						{
+							ajaxinfo : {
+								url : contextPath + '/suggest',
+								fn : '_default,content,title',
+								num : 10,
+								lang : $('#langSearchOption').val()
+							},
+							boxCssInfo : {
+								border : '1px solid rgba(82, 168, 236, 0.5)',
+								'-webkit-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+								'-moz-box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+								'box-shadow' : '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+								'background-color' : '#fff',
+								'z-index' : '10000'
+							},
+							listSelectedCssInfo : {
+								'background-color' : 'rgba(82, 168, 236, 0.1)'
+							},
+							listDeselectedCssInfo : {
+								'background-color' : '#ffffff'
+							},
+							minterm : 1,
+							adjustWidthVal : 11,
+							searchForm : $('#searchForm')
+						});
+	}
 
 	IMG_LOADING_DELAY = 200;
 	IMG_LOADING_MAX = 0;