From 7e5f8df970e777b58983047833071e2d1616e131 Mon Sep 17 00:00:00 2001 From: Isaiah Coleman Date: Wed, 22 Jan 2025 14:25:25 -0500 Subject: [PATCH] Replaces jquery ui bubble popup with newer tooltip API. Preliminary efforts 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 --- .../DDB_EpiDoc_XML/bgu/bgu.1/bgu.1.2.html | 1 - .../bgu/bgu.10/bgu.10.1941.html | 1 - .../p.cair.zen.2/p.cair.zen.2.59195.html | 1 - .../p.fuad.i.univ/p.fuad.i.univ.5.html | 1 - .../src/test/resources/biblio/2/1234.html | 1 - pn-site/authorbrowse.html | 1 - pn-site/bibliosearch.html | 3 - pn-site/browse.html | 3 - pn-site/conventions.html | 1 - .../custom-theme/jquery-ui-dul-theme-shim.css | 6 +- pn-site/css/jquery.bubblepopup.v2.1.5.css | 85 ------------------- pn-site/css/master.css | 1 - pn-site/facetbrowse.html | 2 - pn-site/feedback.html | 1 - pn-site/force-graph.html | 1 - pn-site/js/guidesearch.js | 36 ++++---- pn-site/js/init.js | 19 +++-- pn-site/js/jquery.bubblepopup.v2.1.5.min.js | 26 ------ pn-site/js/jquery.cookie.js | 6 +- pn-site/js/stringsearch.js | 28 +++--- pn-site/template.html | 1 - pn-xslt/Biblio2HTML.xsl | 2 - pn-xslt/MakeHTML.xsl | 1 - 23 files changed, 53 insertions(+), 175 deletions(-) delete mode 100755 pn-site/css/jquery.bubblepopup.v2.1.5.css delete mode 100755 pn-site/js/jquery.bubblepopup.v2.1.5.min.js diff --git a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.1/bgu.1.2.html b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.1/bgu.1.2.html index 1bd7c7663..905b05c04 100755 --- a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.1/bgu.1.2.html +++ b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.1/bgu.1.2.html @@ -26,7 +26,6 @@ - diff --git a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.10/bgu.10.1941.html b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.10/bgu.10.1941.html index 52bf329bb..756f5e55c 100644 --- a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.10/bgu.10.1941.html +++ b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/bgu/bgu.10/bgu.10.1941.html @@ -22,7 +22,6 @@ = Trismegistos 8311 - diff --git a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.cair.zen/p.cair.zen.2/p.cair.zen.2.59195.html b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.cair.zen/p.cair.zen.2/p.cair.zen.2.59195.html index 24b1671c1..76a002ba0 100644 --- a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.cair.zen/p.cair.zen.2/p.cair.zen.2.59195.html +++ b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.cair.zen/p.cair.zen.2/p.cair.zen.2.59195.html @@ -24,7 +24,6 @@ - diff --git a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.fuad.i.univ/p.fuad.i.univ.5.html b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.fuad.i.univ/p.fuad.i.univ.5.html index 9a7db7dea..92234c2b0 100644 --- a/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.fuad.i.univ/p.fuad.i.univ.5.html +++ b/pn-dispatcher/src/test/resources/DDB_EpiDoc_XML/p.fuad.i.univ/p.fuad.i.univ.5.html @@ -21,7 +21,6 @@ = Trismegistos 78225 - diff --git a/pn-dispatcher/src/test/resources/biblio/2/1234.html b/pn-dispatcher/src/test/resources/biblio/2/1234.html index f2655a256..7b0aa2613 100755 --- a/pn-dispatcher/src/test/resources/biblio/2/1234.html +++ b/pn-dispatcher/src/test/resources/biblio/2/1234.html @@ -6,7 +6,6 @@ 1234 - diff --git a/pn-site/authorbrowse.html b/pn-site/authorbrowse.html index 929deb7ca..1bc90cd15 100644 --- a/pn-site/authorbrowse.html +++ b/pn-site/authorbrowse.html @@ -7,7 +7,6 @@ - diff --git a/pn-site/bibliosearch.html b/pn-site/bibliosearch.html index 3d721b09c..683e1d577 100644 --- a/pn-site/bibliosearch.html +++ b/pn-site/bibliosearch.html @@ -9,18 +9,15 @@ - - - - - diff --git a/pn-site/css/custom-theme/jquery-ui-dul-theme-shim.css b/pn-site/css/custom-theme/jquery-ui-dul-theme-shim.css index c8b93aa4c..c8e27ee73 100644 --- a/pn-site/css/custom-theme/jquery-ui-dul-theme-shim.css +++ b/pn-site/css/custom-theme/jquery-ui-dul-theme-shim.css @@ -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 } -} \ No newline at end of file +} + +.tooltip-dul-custom { + opacity: 95%; +} diff --git a/pn-site/css/jquery.bubblepopup.v2.1.5.css b/pn-site/css/jquery.bubblepopup.v2.1.5.css deleted file mode 100755 index 0941c6ba5..000000000 --- a/pn-site/css/jquery.bubblepopup.v2.1.5.css +++ /dev/null @@ -1,85 +0,0 @@ -/* - - jQuery Bubble Popup v.2.1.5 - http://maxvergelli.wordpress.com/jquery-bubble-popup/ - - Copyright (c) 2010 Max Vergelli - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -*/ - - /* Layout Settings */ - .jquerybubblepopup{width:auto;height:auto;margin:0px;padding:0px;position:absolute;border:0px;z-index:100;text-align:center;background-color:transparent;} - .jquerybubblepopup-ie{filter:progid:DXImageTransform.Microsoft.Shadow(color="#666666", Direction=135, Strength=3);} /* the plugin adds this class only if browser is IE; if IE9, it's added to main
else to */ - .jquerybubblepopup table{width:auto;height:auto;margin:0px;padding:0px;display:table;border-collapse:collapse;border-spacing:0px;border:0px;empty-cells:show;background-color:transparent;} - .jquerybubblepopup tbody{display:table-row-group;vertical-align:middle;border:0px;background-color:transparent;} - .jquerybubblepopup td{margin:0px;padding:0px;background-color:transparent;} - .jquerybubblepopup-top-left, .jquerybubblepopup-top-right, - .jquerybubblepopup-bottom-left, .jquerybubblepopup-bottom-right{width:21px;height:21px;overflow:hidden;background-repeat:no-repeat;} - .jquerybubblepopup-top-middle, .jquerybubblepopup-bottom-middle{overflow:hidden;background-repeat:repeat-x;} - .jquerybubblepopup-middle-left, .jquerybubblepopup-middle-right{overflow:hidden;background-repeat:repeat-y;} - .jquerybubblepopup-tail{border:0px;margin:0px;padding:0px;display:inline;} - -/* - Themes: - - The plugin adds the class of the theme (for example ".jquerybubblepopup-azure") - to the main
container, then you can edit the style of any element inside the - Bubble Popup markup for each theme. - - The following code defines fonts and backgrounds of the "innerHtml" for each theme: -*/ - .jquerybubblepopup-azure .jquerybubblepopup-innerHtml, - .jquerybubblepopup-black .jquerybubblepopup-innerHtml, - .jquerybubblepopup-blue .jquerybubblepopup-innerHtml, - .jquerybubblepopup-green .jquerybubblepopup-innerHtml, - .jquerybubblepopup-grey .jquerybubblepopup-innerHtml, - .jquerybubblepopup-orange .jquerybubblepopup-innerHtml, - .jquerybubblepopup-violet .jquerybubblepopup-innerHtml, - .jquerybubblepopup-yellow .jquerybubblepopup-innerHtml - { - font-family:'Trebuchet MS',Arial; - font-size:11px; - font-weight:normal; - color:#000000; - background-color:#FFFFFF; - } - .jquerybubblepopup-all-azure .jquerybubblepopup-innerHtml, - .jquerybubblepopup-all-black .jquerybubblepopup-innerHtml, - .jquerybubblepopup-all-blue .jquerybubblepopup-innerHtml, - .jquerybubblepopup-all-green .jquerybubblepopup-innerHtml, - .jquerybubblepopup-all-grey .jquerybubblepopup-innerHtml, - .jquerybubblepopup-all-orange .jquerybubblepopup-innerHtml, - .jquerybubblepopup-all-violet .jquerybubblepopup-innerHtml, - .jquerybubblepopup-all-yellow .jquerybubblepopup-innerHtml - { - font-family:'Trebuchet MS',Arial; - font-size:11px; - font-weight:normal; - color:#FFFFFF; - } - .jquerybubblepopup-all-azure .jquerybubblepopup-innerHtml{background-color:#0099FF;} - .jquerybubblepopup-all-black .jquerybubblepopup-innerHtml{background-color:#000000;} - .jquerybubblepopup-all-blue .jquerybubblepopup-innerHtml{background-color:#0066CC;} - .jquerybubblepopup-all-green .jquerybubblepopup-innerHtml{background-color:#66FF00;} - .jquerybubblepopup-all-grey .jquerybubblepopup-innerHtml{background-color:#666666;} - .jquerybubblepopup-all-orange .jquerybubblepopup-innerHtml{background-color:#FF9933;} - .jquerybubblepopup-all-violet .jquerybubblepopup-innerHtml{background-color:#FF33FF;} - .jquerybubblepopup-all-yellow .jquerybubblepopup-innerHtml{background-color:#FFCC00;} diff --git a/pn-site/css/master.css b/pn-site/css/master.css index 474ef7219..d7fe561f4 100644 --- a/pn-site/css/master.css +++ b/pn-site/css/master.css @@ -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 { diff --git a/pn-site/facetbrowse.html b/pn-site/facetbrowse.html index a96bc8f58..d9063f016 100644 --- a/pn-site/facetbrowse.html +++ b/pn-site/facetbrowse.html @@ -7,12 +7,10 @@ - - diff --git a/pn-site/feedback.html b/pn-site/feedback.html index ada1e9b73..c43addd6c 100644 --- a/pn-site/feedback.html +++ b/pn-site/feedback.html @@ -7,7 +7,6 @@ - diff --git a/pn-site/force-graph.html b/pn-site/force-graph.html index 486050ea7..0169ccfab 100644 --- a/pn-site/force-graph.html +++ b/pn-site/force-graph.html @@ -7,7 +7,6 @@ - diff --git a/pn-site/js/guidesearch.js b/pn-site/js/guidesearch.js index 7335d10a6..b06df6237 100644 --- a/pn-site/js/guidesearch.js +++ b/pn-site/js/guidesearch.js @@ -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); } @@ -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)){ @@ -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'); @@ -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); @@ -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); }); diff --git a/pn-site/js/init.js b/pn-site/js/init.js index 2d62b1d24..b9ac142fb 100644 --- a/pn-site/js/init.js +++ b/pn-site/js/init.js @@ -27,14 +27,17 @@ function init() { alignRTL(); jQuery("#tmgo").button(); jQuery("span.term").each( function (i, elt) { - jQuery(elt).CreateBubblePopup({ - innerHtml: jQuery(elt).find("span.gloss").html(), - position: "top", - themePath: "/jquerybubblepopup-template/", - selectable: "true", - width: 200, - closingDelay: 500 - }); + const htmlContent = $(elt).find("span.gloss").html(); + if (htmlContent) { + $(elt).tooltip({ + content: innerContent, + position: { + my: "center bottom", + at: "center top", + }, + classes: 'tooltip-dul-custom' + }); + } }); jQuery.ajax({ type: "GET", diff --git a/pn-site/js/jquery.bubblepopup.v2.1.5.min.js b/pn-site/js/jquery.bubblepopup.v2.1.5.min.js deleted file mode 100755 index 2a81d4cc9..000000000 --- a/pn-site/js/jquery.bubblepopup.v2.1.5.min.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - jQuery Bubble Popup v.2.1.5 - http://maxvergelli.wordpress.com/jquery-bubble-popup/ - - Copyright (c) 2010 Max Vergelli - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -*/ - -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(5(a){a.17.3l=5(){4 c=R;a(P).16(5(d,e){4 b=a(e).1o("1B");7(!a.T(b)&&6 b.3.L!="Z"){c=b.3.1I==S?S:U}Q U});Q c};a.17.3u=5(){4 b=R;a(P).16(5(e,f){4 d=a(f).1o("1B");7(!a.T(d)&&6 d.3.L!="Z"&&d.3.1G!=R){b=c(d.3.1G)}Q U});5 c(d){Q 28 2i(d*2j)}Q b};a.17.3F=5(){4 b=R;a(P).16(5(e,f){4 d=a(f).1o("1B");7(!a.T(d)&&6 d.3.L!="Z"&&d.3.1U!=R){b=c(d.3.1U)}Q U});5 c(d){Q 28 2i(d*2j)}Q b};a.17.37=5(){4 b=R;a(P).16(5(e,f){4 d=a(f).1o("1B");7(!a.T(d)&&6 d.3.L!="Z"&&d.3.1u!=R){b=c(d.3.1u)}Q U});5 c(d){Q 28 2i(d*2j)}Q b};a.17.38=5(){4 b=R;a(P).16(5(d,e){4 c=a(e).1o("1B");7(!a.T(c)&&6 c.3.L!="Z"){b=a("#"+c.3.L).Y>0?a("#"+c.3.L).3a():R}Q U});Q b};a.17.3h=5(){4 b=R;a(P).16(5(d,e){4 c=a(e).1o("1B");7(!a.T(c)&&6 c.3.L!="Z"){b=c.3.L}Q U});Q b};a.17.3U=5(){4 b=0;a(P).16(5(d,e){4 c=a(e).1o("1B");7(!a.T(c)&&6 c.3.L!="Z"){a(e).24("2A");a(e).24("2y");a(e).24("2z");a(e).24("1Y");a(e).24("27");a(e).24("25");a(e).1o("1B",{});7(a("#"+c.3.L).Y>0){a("#"+c.3.L).36()}b++}});Q b};a.17.3R=5(){4 c=U;a(P).16(5(d,e){4 b=a(e).1o("1B");7(!a.T(b)&&6 b.3.L!="Z"){c=S}Q U});Q c};a.17.3P=5(){4 b={};a(P).16(5(c,d){b=a(d).1o("1B");7(!a.T(b)&&6 b.3.L!="Z"){3O b.3}1L{b=R}Q U});7(a.T(b)){b=R}Q b};a.17.3N=5(b){7(6 b!="Z"&&!a.1n(b)&&!a.T(b)&&b!=R&&6 b=="1x"){a(P).16(5(c,d){a(d).19("2A",[b])})}};a.17.3K=5(b,c){a(P).16(5(d,e){a(e).19("1Y");7(6 b!="Z"&&!a.1n(b)&&!a.T(b)&&b!=R&&6 b=="1x"){c=6 c=="32"&&c==S?S:U;a(e).19("27",[b,c])}1L{a(e).19("27")}Q U})};a.17.3H=5(){a(P).16(5(b,c){a(c).19("1Y");a(c).19("25",[S]);Q U})};a.17.3E=5(){a(P).16(5(b,c){a(c).19("1Y");a(c).19("25",[S])})};a.17.3B=5(){a(P).16(5(b,c){a(c).19("2z");Q U})};a.17.3w=5(){a(P).16(5(b,c){a(c).19("1Y");Q U})};a.17.3v=5(){a(P).16(5(b,c){a(c).19("1Y")})};a.17.3n=5(q){4 m={2B:P,2D:[],2n:"1B",2Y:["M","1j","1k"],2W:["K","1j","1e"],2V:\'<2U 1t="{1m} {2T}"{2o} L="{2q}"> <2s{2w}> <2S> <29> <15 1t="{1m}-M-K"{21-2C}>{21-2f} <15 1t="{1m}-M-1j"{21-2R}>{21-1E} <15 1t="{1m}-M-1e"{21-2p}>{21-2h} <29> <15 1t="{1m}-1j-K"{1E-2C}>{1E-2f} <15 1t="{1m}-1w"{2u}>{2v} <15 1t="{1m}-1j-1e"{1E-2p}>{1E-2h} <29> <15 1t="{1m}-1k-K"{1Z-2C}>{1Z-2f} <15 1t="{1m}-1k-1j"{1Z-2R}>{1Z-1E} <15 1t="{1m}-1k-1e"{1Z-2p}>{1Z-2h} \',3:{L:R,1u:R,1U:R,1G:R,1I:U,1s:U,1y:{}},1l:R,1h:R,1b:{},1a:{},12:"M",2Q:["K","M","1e","1k"],N:"1X",2r:["K","1X","1e","M","1j","1k"],2m:["K","1X","1e"],2t:["M","1j","1k"],11:"3t",18:3m,1M:0,1N:0,1O:"2c",2P:["2c","2E"],1Q:"2E",2O:["2c","2E"],O:{N:"1X",1H:U},1w:R,1p:{},14:"2N",1D:"3M",1P:"2N-3L/",13:{2e:"3b",1C:"39"},1c:S,1A:5(){},1z:5(){},10:[]};h(q);5 f(t){4 u={3:{},1l:m.1l,1h:m.1h,1b:m.1b,1a:m.1a,12:m.12,N:m.N,11:m.11,18:m.18,1M:m.1M,1N:m.1N,1O:m.1O,1Q:m.1Q,O:m.O,1w:m.1w,1p:m.1p,14:m.14,1D:m.1D,1P:m.1P,13:m.13,1c:m.1c,1A:m.1A,1z:m.1z,10:m.10};4 r=a.3T(U,u,(6 t=="1x"&&!a.1n(t)&&!a.T(t)&&t!=R?t:{}));r.3.L=m.3.L;r.3.1u=m.3.1u;r.3.1U=m.3.1U;r.3.1G=m.3.1G;r.3.1I=m.3.1I;r.3.1s=m.3.1s;r.3.1y=m.3.1y;r.1l=(6 r.1l=="1q"||6 r.1l=="1T")&&W(r.1l)>0?W(r.1l):m.1l;r.1h=(6 r.1h=="1q"||6 r.1h=="1T")&&W(r.1h)>0?W(r.1h):m.1h;r.1b=r.1b!=R&&6 r.1b=="1x"&&!a.1n(r.1b)&&!a.T(r.1b)?r.1b:m.1b;r.1a=r.1a!=R&&6 r.1a=="1x"&&!a.1n(r.1a)&&!a.T(r.1a)?r.1a:m.1a;r.12=6 r.12=="1q"&&o(r.12.1F(),m.2Q)?r.12.1F():m.12;r.N=6 r.N=="1q"&&o(r.N.1F(),m.2r)?r.N.1F():m.N;r.11=(6 r.11=="1q"||6 r.11=="1T")&&W(r.11)>=0?W(r.11):m.11;r.18=6 r.18=="1T"&&W(r.18)>0?W(r.18):m.18;r.1M=6 r.1M=="1T"&&r.1M>=0?r.1M:m.1M;r.1N=6 r.1N=="1T"&&r.1N>=0?r.1N:m.1N;r.1O=6 r.1O=="1q"&&o(r.1O.1F(),m.2P)?r.1O.1F():m.1O;r.1Q=6 r.1Q=="1q"&&o(r.1Q.1F(),m.2O)?r.1Q.1F():m.1Q;r.O=r.O!=R&&6 r.O=="1x"&&!a.1n(r.O)&&!a.T(r.O)?r.O:m.O;r.O.N=6 r.O.N!="Z"?r.O.N:m.O.N;r.O.1H=6 r.O.1H!="Z"?r.O.1H:m.O.1H;r.1w=6 r.1w=="1q"&&r.1w.Y>0?r.1w:m.1w;r.1p=r.1p!=R&&6 r.1p=="1x"&&!a.1n(r.1p)&&!a.T(r.1p)?r.1p:m.1p;r.14=n(6 r.14=="1q"&&r.14.Y>0?r.14:m.14);r.1D=6 r.1D=="1q"&&r.1D.Y>0?a.33(r.1D):m.1D;r.1P=6 r.1P=="1q"&&r.1P.Y>0?a.33(r.1P):m.1P;r.13=r.13!=R&&6 r.13=="1x"&&!a.1n(r.13)&&!a.T(r.13)&&(6 W(r.13.2e)=="1T"&&6 W(r.13.1C)=="1T")?r.13:m.13;r.1c=6 r.1c=="32"&&r.1c==S?S:U;r.1A=6 r.1A=="5"?r.1A:m.1A;r.1z=6 r.1z=="5"?r.1z:m.1z;r.10=a.1n(r.10)?r.10:m.10;7(r.12=="K"||r.12=="1e"){r.N=o(r.N,m.2t)?r.N:"1j"}1L{r.N=o(r.N,m.2m)?r.N:"1X"}1v(4 s 20 r.O){26(s){X"N":r.O.N=6 r.O.N=="1q"&&o(r.O.N.1F(),m.2r)?r.O.N.1F():m.O.N;7(r.12=="K"||r.12=="1e"){r.O.N=o(r.O.N,m.2t)?r.O.N:"1j"}1L{r.O.N=o(r.O.N,m.2m)?r.O.N:"1X"}V;X"1H":r.O.1H=r.O.1H==S?S:U;V}}Q r}5 i(r){7(r==0){Q 0}7(r>0){Q-(1i.1r(r))}1L{Q 1i.1r(r)}}5 o(t,u){4 r=U;1v(4 s 20 u){7(u[s]==t){r=S;V}}Q r}5 c(r){7(2G.2H){1v(4 t=r.Y-1;t>=0;t--){4 s=2G.2H("2I");s.2J=r[t];7(a.3e(r[t],m.2D)>-1){m.2D.2K(r[t])}}}}5 k(r){7(r.10&&r.10.Y>0){1v(4 s=0;s0){1v(4 t=0;t\'}4 s=m.2Y;4 y=m.2W;4 J,D,z,I;4 A="";4 x="";4 C=28 2X();1v(D 20 s){z="";I="";1v(J 20 y){z=s[D]+"-"+y[J];z=z.3c();I="{"+z+"3d}";z="{"+z+"}";7(z==t){G=G.1f(z,w);A=o(u.O.N,m.2m)?"3f-N:"+u.O.N+";":"3g-N:"+u.O.N+";"}1L{G=G.1f(z,"");A=""}7(s[D]+"-"+y[J]!="1j-1j"){x=E+s[D]+"-"+y[J]+"."+(u.1c==S?(a.1d.1R?"2g":"2F"):"2g");C.2K(x);G=G.1f(I,\' 2l="\'+A+"3i-3j:3k("+x+\');"\')}}}7(C.Y>0){c(C)}4 v="";7(u.1a!=R&&6 u.1a=="1x"&&!a.1n(u.1a)&&!a.T(u.1a)){1v(4 B 20 u.1a){v+=B+":"+u.1a[B]+";"}}v+=(u.1l!=R||u.1h!=R)?(u.1l!=R?"1l:"+u.1l+"1J;":"")+(u.1h!=R?"1h:"+u.1h+"1J;":""):"";G=v.Y>0?G.1f("{2w}",\' 2l="\'+v+\'"\'):G.1f("{2w}","");4 H="";7(u.1b!=R&&6 u.1b=="1x"&&!a.1n(u.1b)&&!a.T(u.1b)){1v(4 B 20 u.1b){H+=B+":"+u.1b[B]+";"}}G=H.Y>0?G.1f("{2o}",\' 2l="\'+H+\'"\'):G.1f("{2o}","");G=G.1f("{2T}",u.14+"-"+u.1D);G=u.3.L!=R?G.1f("{2q}",u.3.L):G.1f("{2q}","");3o(G.3p("{1m}")>-1){G=G.1f("{1m}",u.14)}G=u.1w!=R?G.1f("{2v}",u.1w):G.1f("{2v}","");I="";1v(4 B 20 u.1p){I+=B+":"+u.1p[B]+";"}G=I.Y>0?G.1f("{2u}",\' 2l="\'+I+\'"\'):G.1f("{2u}","");Q G}5 d(){Q 1i.3q(28 2i().3r()/2j)}5 e(H,D,w,A,z,G){4 B=28 2X();4 s=G.3s();4 r=W(s.M);4 v=W(s.K);4 I=W(G.2Z(S));4 E=W(G.30(S));4 t=W(z.2Z(S));4 F=W(z.30(S));A.1C=1i.1r(W(A.1C));A.2e=1i.1r(W(A.2e));4 u=i(A.1C);4 C=i(A.1C);4 x=i(A.2e);26(D){X"K":B.M=H=="M"?r-F-w+i(u):r+E+w+u;B.K=v+x;V;X"1X":4 y=1i.1r(t-I)/2;B.M=H=="M"?r-F-w+i(u):r+E+w+u;B.K=t>=I?v-y:v+y;V;X"1e":4 y=1i.1r(t-I);B.M=H=="M"?r-F-w+i(u):r+E+w+u;B.K=t>=I?v-y+i(x):v+y+i(x);V;X"M":B.M=r+x;B.K=H=="K"?v-t-w+i(C):v+I+w+C;V;X"1j":4 y=1i.1r(F-E)/2;B.M=F>=E?r-y:r+y;B.K=H=="K"?v-t-w+i(C):v+I+w+C;V;X"1k":4 y=1i.1r(F-E);B.M=F>=E?r-y+i(x):r+y+i(x);B.K=H=="K"?v-t-w+i(C):v+I+w+C;V}Q B}5 g(s,r){a(s).1o(m.2n,r)}5 b(r){Q a(r).1o(m.2n)}5 h(r){a(3x).3y(5(){a(m.2B).16(5(s,t){a(t).19("2y")})});a(m.2B).16(5(t,u){4 s=f(r);s.3.1u=d();s.3.L=s.14+"-"+s.3.1u+"-"+t;g(u,s);a(u).3z(5(){4 v=b(P);7(!a.T(v)){7(v.1O=="2c"){a(P).19("27")}1L{a(P).19("25")}}});a(u).3A(5(){4 v=b(P);7(!a.T(v)){7(v.1Q=="2c"){a(P).19("27")}1L{a(P).19("25")}}});a(u).23("2A",5(y,x){4 v=b(P);7(!a.T(v)&&6 v.3.L!="Z"){4 w=v;v=f(x);v.3.L=w.3.L;v.3.1u=w.3.1u;v.3.1U=d();v.3.1G=w.3.1G;v.3.1I=w.3.1I;v.3.1s=w.3.1s;v.3.1y={};g(P,v)}});a(u).23("2y",5(){4 w=b(P);7(!a.T(w)&&6 w.3.L!="Z"){7(a("#"+w.3.L).Y>0&&w.3.1I==S){4 v=a("#"+w.3.L);4 x=e(w.12,w.N,w.11,w.13,v,a(P));26(w.12){X"K":v.1g({M:x.M,K:x.K+(1i.1r(w.13.1C)*2)});V;X"M":v.1g({M:x.M+(1i.1r(w.13.1C)*2),K:x.K});V;X"1e":v.1g({M:x.M,K:x.K-(1i.1r(w.13.1C)*2)});V;X"1k":v.1g({M:x.M-(1i.1r(w.13.1C)*2),K:x.K});V}}}});a(u).23("2z",5(){4 v=b(P);7(!a.T(v)&&6 v.3.L!="Z"){v.3.1s=S;g(P,v)}});a(u).23("1Y",5(){4 v=b(P);7(!a.T(v)&&6 v.3.L!="Z"){v.3.1s=U;g(P,v)}});a(u).23("27",5(v,y,B){4 E=b(P);7(!a.T(E)&&6 E.3.L!="Z"&&!E.3.1s){E.3.1I=S;E.3.1s=U;7(6 E.3.1y=="1x"&&!a.1n(E.3.1y)&&!a.T(E.3.1y)){E=E.3.1y}1L{E.3.1y={}}7(6 y!="Z"){4 z=E;4 D=d();E=f(y);E.3.L=z.3.L;E.3.1u=z.3.1u;E.3.1U=D;E.3.1G=D;E.3.1I=S;E.3.1s=U;E.3.1y={};7(B!=S){z.3.1U=D;z.3.1G=D;E.3.1y=z}}g(P,E);k(E);7(a("#"+E.3.L).Y>0){a("#"+E.3.L).36()}4 w={};4 A=j(E);w=a(A);w.3C("3D");w=a("#"+E.3.L);w.1g({1K:0,M:"31",K:"31",12:"3G",2a:"3I"});7(E.1c==S){7(a.1d.1R&&W(a.1d.22)<9){a("#"+E.3.L+" 2s").2d(E.14+"-1S")}}4 C=e(E.12,E.N,E.11,E.13,w,a(P));w.1g({M:C.M,K:C.K});4 x=34(5(){w.35();26(E.12){X"K":w.1W({1K:1,K:"+="+E.11+"1J"},E.18,"1V",5(){7(E.1c==S){7(a.1d.1R&&W(a.1d.22)>8){w.2d(E.14+"-1S")}}E.1A()});V;X"M":w.1W({1K:1,M:"+="+E.11+"1J"},E.18,"1V",5(){7(E.1c==S){7(a.1d.1R&&W(a.1d.22)>8){w.2d(E.14+"-1S")}}E.1A()});V;X"1e":w.1W({1K:1,K:"-="+E.11+"1J"},E.18,"1V",5(){7(E.1c==S){7(a.1d.1R&&W(a.1d.22)>8){w.2d(E.14+"-1S")}}E.1A()});V;X"1k":w.1W({1K:1,M:"-="+E.11+"1J"},E.18,"1V",5(){7(E.1c==S){7(a.1d.1R&&W(a.1d.22)>8){w.2d(E.14+"-1S")}}E.1A()});V}},E.1M)}});a(u).23("25",5(y,A){4 x=b(P);7(!a.T(x)&&6 x.3.L!="Z"&&!x.3.1s&&a("#"+x.3.L).Y>0){4 v=a("#"+x.3.L);4 w=6 A=="Z"?x.1N:0;4 z=34(5(){v.35();7(x.1c==S){7(a.1d.1R&&W(a.1d.22)>8){v.3Q(x.14+"-1S")}}26(x.12){X"K":v.1W({1K:0,K:"-="+x.11+"1J"},x.18,"1V",5(){v.1g("2a","2k");x.1z()});V;X"M":v.1W({1K:0,M:"-="+x.11+"1J"},x.18,"1V",5(){v.1g("2a","2k");x.1z()});V;X"1e":v.1W({1K:0,K:"+="+x.11+"1J"},x.18,"1V",5(){v.1g("2a","2k");x.1z()});V;X"1k":v.1W({1K:0,M:"+="+x.11+"1J"},x.18,"1V",5(){v.1g("2a","2k");x.1z()});V}},w);x.3.1G=d();x.3.1I=U;x.3.1s=U;g(P,x);l(x)}})})}Q P}})(3S);',62,243,'|||privateVars|var|function|typeof|if|||||||||||||||||||||||||||||||||||||||left|id|top|align|tail|this|return|null|true|isEmptyObject|false|break|parseInt|case|length|undefined|hideElementId|distance|position|themeMargins|baseClass|td|each|fn|velocity|trigger|tableStyle|divStyle|dropShadow|browser|right|replace|css|height|Math|middle|bottom|width|BASE_CLASS|isArray|data|innerHtmlStyle|string|abs|is_freezed|class|creation_datetime|for|innerHtml|object|last_options|afterHidden|afterShown|private_jquerybubblepopup_options|difference|themeName|MIDDLE|toLowerCase|last_display_datetime|hidden|is_open|px|opacity|else|openingDelay|closingDelay|mouseOver|themePath|mouseOut|msie|ie|number|last_modified_datetime|swing|animate|center|unfreezebubblepopup|BOTTOM|in|TOP|version|bind|unbind|hidebubblepopup|switch|showbubblepopup|new|tr|display|substring|show|addClass|total|LEFT|gif|RIGHT|Date|1000|none|style|alignHorizontalValues|options_key|DIV_STYLE|RIGHT_STYLE|DIV_ID|alignValues|table|alignVerticalValues|INNERHTML_STYLE|INNERHTML|TABLE_STYLE|visibility|positionbubblepopup|freezebubblepopup|setbubblepopupoptions|me|LEFT_STYLE|cache|hide|png|document|createElement|img|src|push|charAt|visible|jquerybubblepopup|mouseOutValues|mouseOverValues|positionValues|MIDDLE_STYLE|tbody|TEMPLATE_CLASS|div|model_markup|model_td|Array|model_tr|outerWidth|outerHeight|0px|boolean|trim|setTimeout|stop|remove|GetBubblePopupCreationDateTime|GetBubblePopupMarkup|10px|html|13px|toUpperCase|_STYLE|inArray|text|vertical|GetBubblePopupID|background|image|url|IsBubblePopupOpen|250|CreateBubblePopup|while|indexOf|round|getTime|offset|20px|GetBubblePopupLastDisplayDateTime|UnfreezeAllBubblePopups|UnfreezeBubblePopup|window|resize|mouseover|mouseout|FreezeBubblePopup|appendTo|body|HideAllBubblePopups|GetBubblePopupLastModifiedDateTime|absolute|HideBubblePopup|block|alt|ShowBubblePopup|template|azure|SetBubblePopupOptions|delete|GetBubblePopupOptions|removeClass|HasBubblePopup|jQuery|extend|RemoveBubblePopup'.split('|'),0,{})) diff --git a/pn-site/js/jquery.cookie.js b/pn-site/js/jquery.cookie.js index 6df1faca2..4eed69049 100644 --- a/pn-site/js/jquery.cookie.js +++ b/pn-site/js/jquery.cookie.js @@ -83,7 +83,11 @@ jQuery.cookie = function(name, value, options) { if (document.cookie && document.cookie != '') { var cookies = document.cookie.split(';'); for (var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); + // Modified from original code to trim the cookie value using native String.prototype.trim + let cookie = cookies[i]; + if (typeof cookie === 'string') { + cookie = cookie.trim(); + } // Does this cookie string begin with the name we want? if (cookie.substring(0, name.length + 1) == (name + '=')) { cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); diff --git a/pn-site/js/stringsearch.js b/pn-site/js/stringsearch.js index 6277a8d99..b91ef1519 100644 --- a/pn-site/js/stringsearch.js +++ b/pn-site/js/stringsearch.js @@ -11,7 +11,7 @@ { return this.each(function() { - $(this).focus() + $(this).trigger('focus'); // If this function exists... if (this.setSelectionRange) @@ -272,7 +272,7 @@ $(document).ready( if(boxval.match(proxRegExp)){ - $(controls).find(".prxcount").removeAttr("disabled"); + $(controls).find(".prxcount").prop("disabled", false); $(controls).find(".within").css("color", "#000"); } @@ -295,7 +295,7 @@ $(document).ready( if(boxval.match(proxCountRegExp)){ var prxunit = $($(controls).find(".prxunit")); - prxunit.removeAttr("disabled"); + prxunit.prop("disabled", false); if(prxunit.val() != "words" && prxunit.val() != "chars") prxunit.val("chars"); } @@ -345,7 +345,7 @@ $(document).ready( hic.activateButton = function(button){ - $(button).removeAttr("disabled"); + $(button).prop("disabled", false); $(button).removeClass("ui-state-disabled"); $(button).css("background", "#C0D3BC url(css/custom-theme/images/ui-bg_glass_75_c0d3bc_1x400.png) 50% 50% repeat-x"); @@ -367,7 +367,7 @@ $(document).ready( var input = $(parent).find(".keyword"); var val = input.val(); var newVal = (hic.needsSpace(val, keyword) ? val + " " : val) + keyword; - input.focus(); + input.trigger('focus'); input.val(newVal); hic.doButtonActivationCheck(input.val(), parent); hic.doProxControlsActivationCheck(input.val(), parent); @@ -398,7 +398,7 @@ $(document).ready( var input = $(parent).find(".keyword"); var val = input.val(); var newVal = val + mark; - input.focus(); + input.trigger('focus'); input.val(newVal); hic.doButtonActivationCheck(input.val(), parent); hic.doProxControlsActivationCheck(input.val(), parent); @@ -418,8 +418,8 @@ $(document).ready( mtr.after(searchHTML.clone()); var displayVal = val == "+" ? "" : val.toUpperCase() + " "; var textbox = $(lastTopSelector + " .keyword"); - textbox.removeAttr("disabled"); - textbox.focus(); + textbox.prop("disabled", false); + textbox.trigger('focus'); textbox.val(displayVal); hic.doButtonActivationCheck("", $(lastTopSelector)); hic.doProxControlsActivationCheck("", $(lastTopSelector)); @@ -449,7 +449,7 @@ $(document).ready( $(this).parents(topSelector).find(".str-operator").text(""); hic.clearProxValues(this); hic.doButtonActivationCheck("", $(topSelector)); - $(textbox).focus(); + $(textbox).trigger('focus'); } @@ -487,8 +487,8 @@ $(document).ready( var searchbits = hic.trimRecoveredStringSearches(nowsearch); hic.addReqdSearchBoxes(searchbits); hic.removeSearchFromStack(stringbits); - $(topSelector + ":last .keyword").removeAttr("disabled"); - $(topSelector + ":last .keyword").focus(); + $(topSelector + ":last .keyword").prop("disabled", false); + $(topSelector + ":last .keyword").trigger('focus'); $(topSelector + ":last .keyword").putCursorAtEnd(); } @@ -572,12 +572,12 @@ $(document).ready( var buttonBar = $(this).parent().clone(); $(this).parent().parent().remove(); $(lastTopSelector).append(buttonBar); - $(lastTopSelector).find(".keyword").removeAttr("disabled"); - $(lastTopSelector).find(".keyword").focus(); + $(lastTopSelector).find(".keyword").prop("disabled", false); + $(lastTopSelector).find(".keyword").trigger('focus'); var prxcount = $(lastTopSelector + " input.prxcount"); if(prxcount.val().length > 0){ - $(lastTopSelector + " .prx *").removeAttr("disabled"); + $(lastTopSelector + " .prx *").prop("disabled", false); } hic.doButtonActivationCheck($(lastTopSelector).find(".keyword").val(), $(lastTopSelector)); diff --git a/pn-site/template.html b/pn-site/template.html index 6e118d9cd..2ded61df0 100644 --- a/pn-site/template.html +++ b/pn-site/template.html @@ -7,7 +7,6 @@ - diff --git a/pn-xslt/Biblio2HTML.xsl b/pn-xslt/Biblio2HTML.xsl index b3546961d..c3eb99fb0 100644 --- a/pn-xslt/Biblio2HTML.xsl +++ b/pn-xslt/Biblio2HTML.xsl @@ -26,11 +26,9 @@ <xsl:value-of select="t:bibl/t:idno[@type='pi']"/> - - -