Skip to content

Commit

Permalink
Upgrades to search logic and removing jquery update areas outside scope
Browse files Browse the repository at this point in the history
  • Loading branch information
@iccole
iccole committed Dec 4, 2024
1 parent ac38bbe commit 3c0ec6d
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 35 deletions.
2 changes: 1 addition & 1 deletion pn-site/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="css/master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->

<script src="js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion pn-site/authorbrowse.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="/css/master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="/js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->

<script src="/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion pn-site/bibliosearch.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
<script src="/js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->

<!--<script src="/js/jquery.autocomplete.min.js" type="text/javascript" charset="utf-8"></script>-->

<script src="/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
2 changes: 1 addition & 1 deletion pn-site/browse.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/jquery.bubblepopup.v2.1.5.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="/js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->

<script src="/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery.bubblepopup.v2.1.5.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
Expand Down
2 changes: 1 addition & 1 deletion pn-site/conventions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css"
media="screen" title="no title" charset="utf-8" >
<script src="js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->

<script src="js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion pn-site/examples.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Example Page</title>
<link type="text/css" href="css/smoothness/jquery-ui-1.8.1.custom.css" rel="stylesheet" />
<script type="text/javascript" src="js/jquery-1.4.2.min.js"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->

<script type="text/javascript" src="js/jquery-ui-1.8.1.custom.min.js"></script>
<script type="text/javascript">
$(function(){
Expand Down
1 change: 0 additions & 1 deletion pn-site/feedback.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<link rel="stylesheet" href="css/master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->
<script src="js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
1 change: 0 additions & 1 deletion pn-site/force-graph.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@

</style>
<script src="/js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->
<script src="/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
1 change: 0 additions & 1 deletion pn-site/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<link rel="stylesheet" href="/css/master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="/js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->
<script src="/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
1 change: 0 additions & 1 deletion pn-site/js/combobox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
$( "<a>" )
.attr( "tabIndex", -1 )
.attr( "title", "Show All Items" )
.tooltip()
.appendTo( this.wrapper )
.button({
icon: "ui-icon-triangle-1-s",
Expand Down
47 changes: 25 additions & 22 deletions pn-site/js/guidesearch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ $(document).ready(
// submit triggers tidy ...
$("form[name='facets']").on("submit", hic.tidyQueryString);
// ... unless checks need to be in place first
$("form select").not("select[name='DATE_START']").not("select[name='DATE_START_ERA']").not("select[name='DATE_END']").not("select[name='DATE_END_ERA']").not("select[name='prxunit']").change(hic.tidyQueryString);
$("form select").not("select[name='DATE_START']").not("select[name='DATE_START_ERA']").not("select[name='DATE_END']").not("select[name='DATE_END_ERA']").not("select[name='prxunit']").on("change", hic.tidyQueryString);

// sets cookie on click to record to allow reversion to current search results
$("td.identifier a").on("click", (e) => { hic.setCookie("lbpersist", window.location.search, 12); return true; });
Expand Down Expand Up @@ -759,35 +759,38 @@ $(document).ready(
$("select[name='DATE_END']").combobox();
$("select[name='LANG']").combobox();
$("select[name='TRANSL']").combobox();
$(".combobox").on("click", (evt) => {
$(".custom-combobox").on("click", (evt) => {

$(this).val("");
var button = $(this).next("button");
button.css("outline-color", $(this).css("outline-color"));
button.css("outline-width", $(this).css("outline-width"));
button.css("outline-style", $(this).css("outline-style"));
const actionTarget = evt.target;
$(actionTarget).val("");
var button = $(actionTarget).next("a");
button.css("outline-color", $(actionTarget).css("outline-color"));
button.css("outline-width", $(actionTarget).css("outline-width"));
button.css("outline-style", $(actionTarget).css("outline-style"));

});
$(".combobox").blur(function(evt){
$(".custom-combobox").on("blur", (evt) => {

var button = $(this).next("button");
const actionTarget = evt.target;
var button = $(actionTarget).next("a");
button.css("outline","none");


});
$(".combobox").focus(function(evt){
$(".custom-combobox").on("focus", (evt) => {

var button = $(this).next("button");
button.css("outline-color", $(this).css("outline-color"));
button.css("outline-width", $(this).css("outline-width"));
button.css("outline-style", $(this).css("outline-style"));
const actionTarget = evt.target;
var button = $(actionTarget).next("a");
button.css("outline-color", $(actionTarget).css("outline-color"));
button.css("outline-width", $(actionTarget).css("outline-width"));
button.css("outline-style", $(actionTarget).css("outline-style"));

});

$("input[name=DATE_START]").on("focus", (evt) => {

hic.startDateSet = true;
$(this).unbind("focus");
$(evt.target).unbind("focus");

});

Expand All @@ -805,14 +808,14 @@ $(document).ready(

$("input[name=DATE_START]").on("blur", (evt) => {

var val = $(this).val();
var val = $(evt.target).val();
if(val == "" || val == "default") $("input:radio[name=after-era]").attr("disabled", "");

});

$("input[name=DATE_END]").on("blur", (evt) => {

var val = $(this).val();
var val = $(evt.target).val();
if(val == "" || val == "default") $("input:radio[name=before-era]").attr("disabled", "");

});
Expand All @@ -821,7 +824,7 @@ $(document).ready(
$("input[name=DATE_END]").on("focus", (evt) => {

hic.endDateSet = true;
$(this).unbind("focus");
$(evt.target).unbind("focus");

});

Expand All @@ -830,7 +833,7 @@ $(document).ready(
if($("input[name=DATE_START]").val() != "default" && $("input[name=DATE_START]").val() != "Unknown"){

hic.startDateSet = true;
$(this).unbind("change");
$(evt.target).unbind("change");

}

Expand All @@ -841,7 +844,7 @@ $(document).ready(
if($("input[name=DATE_END]").val() != "default" && $("input[name=DATE_END]").val() != "Unknown"){

hic.endDateSet = true;
$(this).unbind("change");
$(evt.target).unbind("change");

}

Expand All @@ -852,13 +855,13 @@ $(document).ready(
if($("input[name=DATE_START]").val() != "default" && $("input[name=DATE_START]").val() != "Unknown"){

hic.startDateSet = true;
$(this).unbind("change");
$(evt.target).unbind("change");

}
if($("input[name=DATE_END]").val() != "default" && $("input[name=DATE_END]").val() != "Unknown"){

hic.endDateSet = true;
$(this).unbind("change");
$(evt.target).unbind("change");

}

Expand Down
1 change: 0 additions & 1 deletion pn-site/resources.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<link rel="stylesheet" href="css/master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->
<script src="js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion pn-site/search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/jquery.bubblepopup.v2.1.5.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="/js/jquery-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script>

<script src="/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery.bubblepopup.v2.1.5.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
Expand Down
1 change: 0 additions & 1 deletion pn-site/template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<link rel="stylesheet" href="/css/master.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.8.14.custom.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="/js/jquery-1.5.1.min.js" type="text/javascript" charset="utf-8"></script>
<!-- <script src="/js/jquery-migrate-3.5.2.js" type="text/javascript" charset="utf-8"></script> -->
<script src="/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down

0 comments on commit 3c0ec6d

Please sign in to comment.