diff --git a/src/main/webapp/js/admin/dashboard.js b/src/main/webapp/js/admin/dashboard.js index fcc46e083..32f96588a 100644 --- a/src/main/webapp/js/admin/dashboard.js +++ b/src/main/webapp/js/admin/dashboard.js @@ -1,6 +1,6 @@ $(function() { - var $content = $("#content"); - var $contentFrame = $("#contentFrame"); + var $content = $("#content"), + $contentFrame = $("#contentFrame"); $contentFrame.on("load", function() { $(this).height($content.height()); }); diff --git a/src/main/webapp/js/admin/searchlist.js b/src/main/webapp/js/admin/searchlist.js index 1a0f26193..64612fd9b 100644 --- a/src/main/webapp/js/admin/searchlist.js +++ b/src/main/webapp/js/admin/searchlist.js @@ -1,7 +1,7 @@ $(function() { - var SEP_CHAR = "-"; - var langCode; - var browserLang = + var SEP_CHAR = "-", + langCode, + browserLang = (window.navigator.languages && window.navigator.languages[0]) || window.navigator.language || window.navigator.userLanguage || diff --git a/src/main/webapp/js/advance.js b/src/main/webapp/js/advance.js index fec021de8..f014c784f 100644 --- a/src/main/webapp/js/advance.js +++ b/src/main/webapp/js/advance.js @@ -1,6 +1,6 @@ $(function() { - var $searchButton = $("#searchButton"); - var contextPath = $("#contextPath").val(); + var $searchButton = $("#searchButton"), + contextPath = $("#contextPath").val(); $("#searchForm").on("submit", function(e) { $searchButton.attr("disabled", true); diff --git a/src/main/webapp/js/help.js b/src/main/webapp/js/help.js index e7deb6cfe..02a9ce947 100644 --- a/src/main/webapp/js/help.js +++ b/src/main/webapp/js/help.js @@ -1,6 +1,6 @@ $(function() { - var $searchButton = $("#searchButton"); - var contextPath = $("#contextPath").val(); + var $searchButton = $("#searchButton"), + contextPath = $("#contextPath").val(); $("#searchForm").on("submit", function(e) { $searchButton.attr("disabled", true); diff --git a/src/main/webapp/js/index.js b/src/main/webapp/js/index.js index 6a25cdf93..1f1c54ae5 100644 --- a/src/main/webapp/js/index.js +++ b/src/main/webapp/js/index.js @@ -1,8 +1,8 @@ $(function() { $("#contentQuery").focus(); - var $searchButton = $("#searchButton"); - var contextPath = $("#contextPath").val(); + var $searchButton = $("#searchButton"), + contextPath = $("#contextPath").val(); $("#searchForm").on("submit", function(e) { $searchButton.attr("disabled", true); diff --git a/src/main/webapp/js/login.js b/src/main/webapp/js/login.js index 123c51890..9f40a7fec 100644 --- a/src/main/webapp/js/login.js +++ b/src/main/webapp/js/login.js @@ -8,8 +8,9 @@ $(function() { .focus(); $("section.content input").keypress(function(e) { + var $submitButton; if (e.which === 13) { - var $submitButton = $("input#submit, button#submit"); + $submitButton = $("input#submit, button#submit"); if ($submitButton.length > 0) { $submitButton[0].submit(); } @@ -35,10 +36,10 @@ $(function() { }); $("#confirmToDelete").on("show.bs.modal", function(event) { - var button = $(event.relatedTarget); - var docId = button.data("docid"); - var title = button.data("title"); - var url = button.data("url"); + var button = $(event.relatedTarget), + docId = button.data("docid"), + title = button.data("title"), + url = button.data("url"); $(this) .find(".modal-body #delete-doc-title") diff --git a/src/main/webapp/js/profile.js b/src/main/webapp/js/profile.js index 123c51890..9f40a7fec 100644 --- a/src/main/webapp/js/profile.js +++ b/src/main/webapp/js/profile.js @@ -8,8 +8,9 @@ $(function() { .focus(); $("section.content input").keypress(function(e) { + var $submitButton; if (e.which === 13) { - var $submitButton = $("input#submit, button#submit"); + $submitButton = $("input#submit, button#submit"); if ($submitButton.length > 0) { $submitButton[0].submit(); } @@ -35,10 +36,10 @@ $(function() { }); $("#confirmToDelete").on("show.bs.modal", function(event) { - var button = $(event.relatedTarget); - var docId = button.data("docid"); - var title = button.data("title"); - var url = button.data("url"); + var button = $(event.relatedTarget), + docId = button.data("docid"), + title = button.data("title"), + url = button.data("url"); $(this) .find(".modal-body #delete-doc-title") diff --git a/src/main/webapp/js/search.js b/src/main/webapp/js/search.js index 54e6724cf..f00c89c78 100644 --- a/src/main/webapp/js/search.js +++ b/src/main/webapp/js/search.js @@ -1,9 +1,10 @@ $(function() { - var $result = $("#result"); - var $queryId = $("#queryId"); - var $favorites = $(".favorite", $result); - var $searchButton = $("#searchButton"); - var contextPath = $("#contextPath").val(); + var $result = $("#result"), + $queryId = $("#queryId"), + $favorites = $(".favorite", $result), + $searchButton = $("#searchButton"), + contextPath = $("#contextPath").val(), + loadImage; $("#searchForm").on("submit", function(e) { $searchButton.attr("disabled", true); @@ -44,7 +45,9 @@ $(function() { queryId = $("#queryId").val(), order = $(this).attr("data-order"), url = $(this).attr("href"), - buf = []; + buf = [], + hashIndex, + hashStr; buf.push(contextPath); buf.push("/go/?rt="); buf.push(rt); @@ -55,9 +58,9 @@ $(function() { buf.push("&order="); buf.push(order); - var hashIndex = url.indexOf("#"); + hashIndex = url.indexOf("#"); if (hashIndex >= 0) { - var hashStr = url.substring(hashIndex); + hashStr = url.substring(hashIndex); buf.push("&hash="); buf.push(encodeURIComponent(hashStr)); } @@ -69,16 +72,18 @@ $(function() { var docId = $(this).attr("data-id"), rt = $("#rt").val(), url = $(this).attr("href"), - buf = []; + buf = [], + hashIndex, + hashStr; buf.push(contextPath); buf.push("/go/?rt="); buf.push(rt); buf.push("&docId="); buf.push(docId); - var hashIndex = url.indexOf("#"); + hashIndex = url.indexOf("#"); if (hashIndex >= 0) { - var hashStr = url.substring(hashIndex); + hashStr = url.substring(hashIndex); buf.push("&hash="); buf.push(encodeURIComponent(hashStr)); buf.push(hashStr); @@ -86,11 +91,13 @@ $(function() { }); $result.on("click", "a.favorite", function(e) { - var $favorite = $(this); - var values = $favorite.attr("href").split("#"); + var $favorite = $(this), + values = $favorite.attr("href").split("#"), + actionUrl, + docId; if (values.length === 2 && $queryId.length > 0) { - var actionUrl = contextPath + "/json"; - var docId = values[1]; + actionUrl = contextPath + "/json"; + docId = values[1]; $.ajax({ dataType: "json", cache: false, @@ -104,13 +111,15 @@ $(function() { } }) .done(function(data) { + var $favorited, + $favoritedCount; if ( data.response.status === 0 && typeof data.response.result !== "undefined" && data.response.result === "ok" ) { - var $favorited = $favorite.siblings(".favorited"); - var $favoritedCount = $(".favorited-count", $favorited); + $favorited = $favorite.siblings(".favorited"); + $favoritedCount = $(".favorited-count", $favorited); $favoritedCount.css("display", "none"); $favorite.fadeOut(1000, function() { $favorited.fadeIn(1000); @@ -139,27 +148,31 @@ $(function() { } }) .done(function(data) { + var docIds, + i; if ( data.response.status === 0 && typeof data.response.num !== "undefined" && data.response.num > 0 ) { - var docIds = data.response.doc_ids; - for (var i = 0; i < docIds.length; i++) { + docIds = data.response.doc_ids; + for (i = 0; i < docIds.length; i++) { docIds[i] = "#" + docIds[i]; } $favorites.each(function(index) { - var $favorite = $(this); - var url = $favorite.attr("href"); - var found = false; - for (var i = 0; i < docIds.length; i++) { + var $favorite = $(this), + url = $favorite.attr("href"), + found = false, + $favorited, + i; + for (i = 0; i < docIds.length; i++) { if (url === docIds[i]) { found = true; break; } } if (found) { - var $favorited = $favorite.siblings(".favorited"); + $favorited = $favorite.siblings(".favorited"); $favorite.fadeOut(1000, function() { $favorited.fadeIn(1000); }); @@ -173,10 +186,11 @@ $(function() { } $result.on("click", ".more a", function(e) { - var $moreLink = $(this); - var value = $moreLink.attr("href"); + var $moreLink = $(this), + value = $moreLink.attr("href"), + $info; if (value !== "") { - var $info = $(value + " .info"); + $info = $(value + " .info"); if ($info.length > 0) { $moreLink.fadeOut(500, function() { $info.slideDown("slow"); @@ -219,7 +233,7 @@ $(function() { IMG_LOADING_DELAY = 200; IMG_LOADING_MAX = 0; - var loadImage = function(img, url, limit) { + loadImage = function(img, url, limit) { var imgData = new Image(); $(imgData).on("load", function() { $(img).css("background-image", ""); diff --git a/src/main/webapp/js/suggestor.js b/src/main/webapp/js/suggestor.js index 8d1e32543..82c53925b 100644 --- a/src/main/webapp/js/suggestor.js +++ b/src/main/webapp/js/suggestor.js @@ -1,27 +1,29 @@ (function($) { $.fn.suggestor = function(setting) { - var $boxElement; - var $textArea; - var inputText = ""; - var isFocusList = false; - var listNum = 0; - var listSelNum = 0; - var isMouseHover = false; - var started = false; - var interval = 5; + var $boxElement, + $textArea, + inputText = "", + isFocusList = false, + listNum = 0, + listSelNum = 0, + isMouseHover = false, + started = false, + interval = 5, - var settingMinTerm = 1; - var settingAjaxInfo; - var settingAdjustWidthVal; - var $settingSearchForm; - var listSelectedCssInfo; - var listDeselectedCssInfo; - var boxCssInfo; + settingMinTerm = 1, + settingAjaxInfo, + settingAdjustWidthVal, + $settingSearchForm, + listSelectedCssInfo, + listDeselectedCssInfo, + boxCssInfo, - var suggestingSts = false; + suggestingSts = false, - var suggestor = { + suggestor = { init: function($element, setting) { + var suggestor; + suggestingSts = false; $boxElement = $("
"); $boxElement.addClass("suggestorBox"); @@ -76,7 +78,7 @@ ); this.resize(); - var suggestor = this; + suggestor = this; $(window).resize(function() { suggestor.resize(); }); @@ -129,37 +131,44 @@ return; } - var hits = obj.response.result.hits; - var suggestor = this; + var hits = obj.response.result.hits, + suggestor = this, + reslist, + $olEle, + str, + chkCorrectWord, + $tmpli, + $liEle, + i, j, k; listNum = 0; if (typeof hits !== "undefined") { - var reslist = []; - for (var i = 0; i < hits.length; i++) { + reslist = []; + for (i = 0; i < hits.length; i++) { reslist.push(hits[i].text); } - var $olEle = $("