5edf4ac72866f696753442f60b6ab1e3c984f381
max
Tue Jul 5 05:03:30 2022 -0700
remove tag order dependency in javascript code, refs #29696, remove alert text URL, refs #29583. Hopefully the last suggestions for a tiny feature.
diff --git src/hg/js/hgHubConnect.js src/hg/js/hgHubConnect.js
index eb17eed..d45463b 100644
--- src/hg/js/hgHubConnect.js
+++ src/hg/js/hgHubConnect.js
@@ -1,214 +1,214 @@
function makeIframe(ev) {
/* It's unusual to show script output in an iframe. But this solution has a few advantages:
* - We can show a "waiting" message while the data loads
* - The user knows where the results will appear, it looks like a dialog box and covers the page
*/
ev.stopPropagation();
var validateText = document.getElementById('validateHubUrl');
validateText.value=$.trim(validateText.value);
var hubUrl = $('#validateHubUrl').val();
if(!validateUrl(hubUrl)) {
alert('Invalid hub URL');
return;
}
hgsid = document.querySelector("input[name='hgsid']").value;
var myUrl = window.location.href.split("#")[0].split("?")[0]; // strip off hgsid and tab-name
var waitUrl = myUrl + '?hgsid=' + hgsid + '&hgHub_do_hubCheck=1';
var node = document.createElement('iframe');
node.setAttribute('src', waitUrl);
node.setAttribute('width', document.documentElement.clientWidth-100+'px');
node.setAttribute('height', document.documentElement.clientHeight-100+'px');
node.style.position = 'absolute';
node.style.top = '50px';
node.style.left = '50px';
node.style.border = '3px solid darkgrey';
node.id = 'checkerFrame';
// first show the loading page
document.body.appendChild(node);
// when the waiting page has finished loading, load the hub checker page
var finalUrl = waitUrl + '&validateHubUrl='+hubUrl;
var alreadyRun = false;
node.addEventListener("load", function() {
if (! alreadyRun)
node.setAttribute('src', finalUrl);
alreadyRun = true; // because 'load' fires again when finalUrl is loaded
this.contentWindow.focus(); // activate keyboard event handlers of the iframe
});
return false;
}
function closeIframe() {
var theFrame = window.parent.document.getElementById('checkerFrame');
theFrame.parentNode.removeChild(theFrame);
}
function reloadIframe() {
document.getElementById("content").innerHTML = "Re-loading hub...";
window.parent.document.getElementById('checkerFrame').src += '';
}
// hover effect to highlight table rows
$(function() {
$(".hubList tr").hover(
function() {
$(this).addClass("hoverRow");
}, function() {
$(this).removeClass("hoverRow");
});
});
// initializes the tabs - with cookie option
// cookie option requires jquery.cookie.js
$(function() {
$("#tabs").tabs({
cookie: {
name: 'hubTab_cookie',
expires: 30
}
});
});
// creates keyup event; listening for return key press
$(document).ready(function() {
$('#loadSampleHub').bind('click', function(e) {
$('#validateHubUrl').val("https://genome.ucsc.edu/goldenPath/help/examples/hubDirectory/hub.txt");
});
$('#hubUrl').bind('keypress', function(e) { // binds listener to url field
if (e.which === 13) { // listens for return key
e.preventDefault(); // prevents return from also submitting whole form
if (validateUrl($('#hubUrl').val()))
$('input[name="hubAddButton"]').focus().click(); // clicks AddHub button
}
});
$('#validateHubUrl').bind('keypress', function(e) { // binds listener to url field
if (e.which === 13) { // listens for return key
e.preventDefault(); // prevents return from also submitting whole form
if (validateUrl($('#validateHubUrl').val()))
$('input[name="hubValidateButton"]').focus().click(); // clicks Validate Url button
}
});
$('#hubSearchTerms').bind('keypress', function(e) { // binds listener to text field
if (e.which === 13) { // listens for return key
e.preventDefault(); // prevents return from also submitting whole form
$('input[name="hubSearchButton"]').focus().click(); // clicks search button
}
});
$('#hubDbFilter').bind('keypress', function(e) { // binds listener to text field
if (e.which === 13) { // listens for return key
e.preventDefault(); // prevents return from also submitting whole form
$('input[name="hubSearchButton"]').focus().click(); // clicks db filter button
}
});
$('.pasteIcon').bind('click', function(e) {
// The genome=hg19-part is stored in the element two elements before the icon SVG:
// Because the HTML code generated by the CGI looks like this:
//