Skip to content

Commit

Permalink
Replaces jquery ui bubble popup with newer tooltip API. Preliminary e…
Browse files Browse the repository at this point in the history 
…fforts were made to use bootstrap's tooltip but bootstrap and jquery ui don't place nice and override each other's functionality. There is likely a way offset the bad effects but it also seems hazardous at the moment as we just want to replicate tooltip functionality. Also removes jQuery 1.5.1 imports and updates deprecated functionality
  • Loading branch information
@iccole
iccole committed Jan 22, 2025
1 parent 6338c3d commit 7e5f8df
Show file tree
Hide file tree
Showing 23 changed files with 53 additions and 175 deletions.
1 change: 0 additions & 1 deletion pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.1/bgu.1.2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
</title>
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
1 change: 0 additions & 1 deletion pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.10/bgu.10.1941.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
= Trismegistos <a href="http://www.trismegistos.org/text/8311">8311</a></title>
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
1 change: 0 additions & 1 deletion ...patcher/src/test/resources/DDB_EpiDoc_XML/p.cair.zen/p.cair.zen.2/p.cair.zen.2.59195.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
</title>
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
1 change: 0 additions & 1 deletion pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.fuad.i.univ/p.fuad.i.univ.5.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
= Trismegistos <a href="http://www.trismegistos.org/text/78225">78225</a></title>
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
1 change: 0 additions & 1 deletion pn-dispatcher/src/test/resources/biblio/2/1234.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<title>1234</title>
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
1 change: 0 additions & 1 deletion pn-site/authorbrowse.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.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
3 changes: 0 additions & 3 deletions pn-site/bibliosearch.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,15 @@
<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.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="/css/jquery.bubblepopup.v2.1.5.css" type="text/css" media="screen" title="no title" charset="utf-8">
<!--<link rel="stylesheet" href="/css/autocomplete/autocomplete.css" type="text/css" media="screen" title="no title" charset="utf-8">-->
<!--[if IE]>
<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
<!--<script src="/js/jquery.autocomplete.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>
<script src="/js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
3 changes: 0 additions & 3 deletions pn-site/browse.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@
<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.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
<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.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>
<script src="/js/init.js" type="text/javascript" charset="utf-8"></script>
<script>
Expand Down
1 change: 0 additions & 1 deletion pn-site/conventions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
charset="utf-8" >
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-1.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
6 changes: 5 additions & 1 deletion pn-site/css/custom-theme/jquery-ui-dul-theme-shim.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,8 @@ div.content.search {
.search-closed .facet-widget.date-facet-widget { display: none }
.facet-widget.date-facet-widget input.custom-combobox-input { width: auto }
#id-selector-wrapper input.custom-combobox-input { width: auto }
}
}

.tooltip-dul-custom {
opacity: 95%;
}
85 changes: 0 additions & 85 deletions pn-site/css/jquery.bubblepopup.v2.1.5.css
View file

This file was deleted.

1 change: 0 additions & 1 deletion pn-site/css/master.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import url("custom-theme/jquery-ui-1.8.14.custom.css");
@import url("jquery.bubblepopup.v2.1.5.css");
@import url("yui/reset-fonts-grids.css");

html {
Expand Down
2 changes: 0 additions & 2 deletions pn-site/facetbrowse.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
<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.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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">
<link rel="stylesheet" href="/css/autocomplete/autocomplete.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.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.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>
<!-- typegreek code written by Randy Hoyt, http://www.typegreek.com/overview/. Used with gratitude and permission -->
<script src="/js/typegreek.js" type="text/javascript" charset="utf-8"></script>
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.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></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 @@ -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.14.1.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/custom-theme/jquery-ui-dul-theme-shim.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-3.7.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-migrate-3.5.2.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/js/jquery-ui-1.14.1.min.js" type="text/javascript" charset="utf-8"></script>
Expand Down
36 changes: 18 additions & 18 deletions pn-site/js/guidesearch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@ $(document).ready(

if(val == "text"){

$("#beta-on, #caps, #marks").removeAttr("disabled", "disabled");
$("#beta-on, #caps, #marks").prop("disabled", false);
hic.checkBetacode();

}
else{

$("#beta-on").removeAttr("checked");
$("#beta-on").attr("disabled", "disabled");
$("#caps").attr("checked", "checked");
$("#caps").attr("disabled", "disabled");
$("#marks").attr("checked", "checked");
$("#marks").attr("disabled", "disabled");
$("#beta-on").prop("checked", false);
$("#beta-on").prop("disabled", true);
$("#caps").prop("checked", true);
$("#caps").prop("disabled", true);
$("#marks").prop("checked", true);
$("#marks").prop("disabled", true);

}

Expand Down Expand Up @@ -313,7 +313,7 @@ $(document).ready(

var keyword = $(stringcontrols[i]).find(".keyword").val();
var searchString = keyword.replace(/(\s+)/g, " ");
searchString = $.trim(searchString);
searchString = searchString.trim();
if(searchString.length == 0) continue;
searchString = "(" + searchString + ")";
if(keyword.match(proxRegExp)){
Expand Down Expand Up @@ -364,29 +364,29 @@ $(document).ready(

if(betaOn){

$(this).keypress(function(event){ return convertCharToggle(this, true, event); });
$(this).keyup(function(event){ return convertStr( this, event ); });
$(this).on('keypress', function(event){ return convertCharToggle(this, true, event); });
$(this).on('keyup', function(event){ return convertStr( this, event ); });

}
else{

$(this).keyup(function(event){
$(this).on('keyup', function(event){
event.stopPropagation();
var val = $(this).val();
if(!colonFound && val.match(":")) {

colonFound = true;
$(".stringsearch-section input:radio").attr("disabled", "disabled");
$(".stringsearch-section input:checkbox").removeAttr("disabled");
$(".stringsearch-section input:radio").prop("disabled", true);
$(".stringsearch-section input:checkbox").prop("disabled", false);
selectedRadios = $(".stringsearch-section input:radio:checked");
$(".stringsearch-section input:radio:checked").removeAttr("checked");
$(".stringsearch-section input:radio:checked").prop("checked", false);

}
// check to make sure user hasn't deleted a previously-entered colon char
else if(!val.match(":") && colonFound){

colonFound = false;
$(".stringsearch-section input:radio").removeAttr("disabled");
$(".stringsearch-section input:radio").prop("disabled", false);
for(var i = 0; i < selectedRadios.length; i++){

selectedRadios[i].trigger('click');
Expand Down Expand Up @@ -651,7 +651,7 @@ $(document).ready(
// turning betacode on/off selects text input
$("#beta-on").on("change", () => {

$(".stringsearch-top-controls:last .keyword").focus();
$(".stringsearch-top-controls:last .keyword").trigger('focus');
var beta = $(this).is(":checked") ? "beta-on" : "beta-off";
$.cookie(hic.BETA_COOKIE, beta);

Expand Down Expand Up @@ -730,13 +730,13 @@ $(document).ready(

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

$("input:radio[name=after-era]").removeAttr("disabled");
$("input:radio[name=after-era]").prop("disabled", false);

});

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

$("input:radio[name=before-era]").removeAttr("disabled");
$("input:radio[name=before-era]").prop("disabled", false);

});

Expand Down
Loading

0 comments on commit 7e5f8df

Please sign in to comment.