diff --git a/src/main/webapp/WEB-INF/view/header.jsp b/src/main/webapp/WEB-INF/view/header.jsp
index af16169744b47c3a061d4dfeb7d854a84e92c702..f0558f8095658f4f71a164644ea8408a26b04341 100755
--- a/src/main/webapp/WEB-INF/view/header.jsp
+++ b/src/main/webapp/WEB-INF/view/header.jsp
@@ -9,7 +9,7 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
alt="<bean:message key="labels.header_brand_name" />" />
</s:link>
<div class="navbar-form pull-right">
- <html:text property="query" maxlength="1000" styleId="query" />
+ <html:text property="query" maxlength="1000" styleId="query" autocomplete="off"/>
<button class="btn medium btn-primary" type="submit" name="search"
id="searchButton">
<i class="icon-search icon-white"></i><span class="hidden-phone"><bean:message
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index f6aa2225d428d7f4908102616dce952684c26b7d..ad33caabdc4c1d60947a65761f5d2a71a2dfb46c 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -52,7 +52,7 @@
<div class="clearfix">
<div class="input">
<html:text styleClass="query" property="query" size="50"
- maxlength="1000" styleId="contentQuery" />
+ maxlength="1000" styleId="contentQuery" autocomplete="off" />
</div>
</div>
<c:if test="${fe:hswsize(null) != 0}">
@@ -174,37 +174,11 @@
</div>
<jsp:include page="footer.jsp" />
</div>
+ <input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
- <script type="text/javascript" src="${f:url('/js/index.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
- <script type="text/javascript" src="js/suggestor.js"></script>
- <script>
- $(function(){
- $("#contentQuery").suggestor( {
- ajaxinfo: {
- url: "/fess/json",
- fn: "content",
- num: 10
- },
- 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"
- },
- listSelectedCssInfo: {
- "background-color": "rgba(82, 168, 236, 0.1)"
- },
- listDeselectedCssInfo: {
- "background-color": "#ffffff"
- },
- minturm: 1,
- adjustWidthVal: 11,
- searchForm: $('#searchForm')
- });
- });
- </script>
+ <script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
+ <script type="text/javascript" src="${f:url('/js/index.js')}"></script>
</body>
</html>
diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp
index 615c93efd5129c4e631d001b123270ab3d7c7105..614c15a5cbfd263a4674f2f418720933c11042bd 100644
--- a/src/main/webapp/WEB-INF/view/search.jsp
+++ b/src/main/webapp/WEB-INF/view/search.jsp
@@ -45,9 +45,11 @@
</c:choose>
<jsp:include page="footer.jsp" />
</div>
+ <input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
- <script type="text/javascript" src="${f:url('/js/search.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
+ <script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
+ <script type="text/javascript" src="${f:url('/js/search.js')}"></script>
</body>
</html>
diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp
index a3cedc0540a4b1499df162d09e6e9fbf8eea40be..76931ee731b0f2d789b0e46fde81fbaa9f00777d 100644
--- a/src/main/webapp/WEB-INF/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/view/searchResults.jsp
@@ -23,7 +23,6 @@
</c:if>
<div id="result" class="row content">
<input type="hidden" id="queryId" value="${f:u(queryId)}" />
- <input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<input type="hidden" id="rt" value="${f:u(rt)}" />
<div class="span8">
<ol>
diff --git a/src/main/webapp/js/index.js b/src/main/webapp/js/index.js
index 659f8e007f7b12212b74799f0f066d4602f1f01f..5353b1bdb8f348b8076027839d6e3a428d0a0560 100644
--- a/src/main/webapp/js/index.js
+++ b/src/main/webapp/js/index.js
@@ -1,5 +1,6 @@
$(function(){
var $searchButton = $('#searchButton');
+ var contextPath = $('#contextPath').val();
$('#searchForm').on('submit', function(e) {
$searchButton.attr('disabled', true);
@@ -16,4 +17,28 @@ $(function(){
return false;
});
+ $('#contentQuery').suggestor( {
+ ajaxinfo: {
+ url: contextPath + '/json',
+ fn: 'content',
+ num: 10
+ },
+ 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'
+ },
+ listSelectedCssInfo: {
+ 'background-color': 'rgba(82, 168, 236, 0.1)'
+ },
+ listDeselectedCssInfo: {
+ 'background-color': '#ffffff'
+ },
+ minturm: 1,
+ adjustWidthVal: 11,
+ searchForm: $('#searchForm')
+ });
+
});
diff --git a/src/main/webapp/js/search.js b/src/main/webapp/js/search.js
index 804278e985fd8a106148501b1d4c3b4ef2aaf60b..2594d3555417742185b69fe96a0b7881d061c03c 100644
--- a/src/main/webapp/js/search.js
+++ b/src/main/webapp/js/search.js
@@ -4,6 +4,7 @@ $(function(){
var $favorites = $('.favorite', $result);
var $screenshot = $('#screenshot', $result);
var $searchButton = $('#searchButton');
+ var contextPath = $('#contextPath').val();
$('#searchForm').on('submit', function(e) {
$searchButton.attr('disabled', true);
@@ -57,7 +58,6 @@ $(function(){
var $favorite = $(this);
var values = $favorite.attr('href').split('#');
if(values.length === 2 && $queryId.size() > 0){
- var contextPath = $('#contextPath').val();
var actionUrl = contextPath + '/json';
var docId = values[1];
$.ajax({
@@ -88,7 +88,6 @@ $(function(){
});
if($favorites.size() > 0) {
- var contextPath = $('#contextPath').val();
$.ajax({
dataType: 'json',
cache: false,
@@ -141,4 +140,29 @@ $(function(){
}
return false;
});
+
+ $('#query').suggestor( {
+ ajaxinfo: {
+ url: contextPath + '/json',
+ fn: 'content',
+ num: 10
+ },
+ 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'
+ },
+ listSelectedCssInfo: {
+ 'background-color': 'rgba(82, 168, 236, 0.1)'
+ },
+ listDeselectedCssInfo: {
+ 'background-color': '#ffffff'
+ },
+ minturm: 1,
+ adjustWidthVal: 11,
+ searchForm: $('#searchForm')
+ });
+
});
diff --git a/src/main/webapp/js/suggestor.js b/src/main/webapp/js/suggestor.js
index 8b8518a9760eb1f32d558e19b29bd29be6431c6c..e914e2bdb90a9196a5ffcab3e289f2b5e7e8bc15 100644
--- a/src/main/webapp/js/suggestor.js
+++ b/src/main/webapp/js/suggestor.js
@@ -167,7 +167,6 @@ $.fn.suggestor = function(setting) {
var str = $(this).html();
suggestor.fixList();
$textArea.val(str);
- //BEGIN: N2 SEARCH 検索開始
if(typeof $settingSearchForm !== "undefined") {
$settingSearchForm.submit();
//$settingSearchForm.trigger("submit");