diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 2141c2769..f22379a20 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -836,6 +836,29 @@ function hideDeletedForms() {
})();
+function initializeTooltips() {
+ function checkTooltip() {
+ //console.log('Checking for tooltip...');
+ if (window.tooltip && typeof window.tooltip.init === 'function') {
+ console.log('Tooltip is available, initializing...');
+ window.tooltip.init();
+ } else {
+ console.log('Tooltip not available, retrying...');
+ // Retry after a short delay
+ setTimeout(checkTooltip, 100);
+ }
+ }
+ checkTooltip();
+}
+
+function initializeModals() {
+ window.modal.on();
+}
+
+function unloadModals() {
+ window.modal.off();
+}
+
document.addEventListener('DOMContentLoaded', function() {
let currentPage = 1;
let currentSortBy = 'id';
@@ -885,13 +908,13 @@ document.addEventListener('DOMContentLoaded', function() {
aria-label="Status Information"
role="tooltip"
>
-
+
${domain.state === 'deleted' || domain.state === 'on hold' ? 'View' : 'Manage'} ${domain.name}
@@ -899,6 +922,7 @@ document.addEventListener('DOMContentLoaded', function() {
`;
domainList.appendChild(row);
});
+ initializeTooltips();
updatePagination(data.page, data.num_pages, data.has_previous, data.has_next);
currentPage = page;
@@ -908,6 +932,7 @@ document.addEventListener('DOMContentLoaded', function() {
.catch(error => console.error('Error fetching domains:', error));
}
+
function updatePagination(currentPage, numPages, hasPrevious, hasNext) {
const paginationContainer = document.querySelector('#domains-pagination .usa-pagination__list');
paginationContainer.innerHTML = '';
@@ -918,7 +943,7 @@ document.addEventListener('DOMContentLoaded', function() {
prevPageItem.innerHTML = `
@@ -948,7 +973,7 @@ document.addEventListener('DOMContentLoaded', function() {
`;
@@ -997,8 +1022,9 @@ document.addEventListener('DOMContentLoaded', function() {
const tbody = document.querySelector('.dotgov-table__domain-requests tbody');
tbody.innerHTML = '';
+ unloadModals();
data.domain_requests.forEach(request => {
- const domainName = request.requested_domain ? request.requested_domain.name : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`;
+ const domainName = request.requested_domain ? request.requested_domain : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`;
const submissionDate = request.submission_date ? new Date(request.submission_date).toLocaleDateString() : 'Not submitted';
const actionUrl = (request.status === 'Started' || request.status === 'Withdrawn') ? `/domain-request/${request.id}/edit` : `/domain-request/${request.id}`;
const actionLabel = (request.status === 'Started' || request.status === 'Withdrawn') ? 'Edit' : 'Manage';
@@ -1012,7 +1038,7 @@ document.addEventListener('DOMContentLoaded', function() {
data-open-modal
>
Delete ${domainName}
` : '';
@@ -1034,13 +1060,13 @@ document.addEventListener('DOMContentLoaded', function() {
aria-label="Status Information"
role="tooltip"
>
-
+
|
${actionLabel} ${request.requested_domain ? request.requested_domain.name : 'New domain request'}
@@ -1049,6 +1075,8 @@ document.addEventListener('DOMContentLoaded', function() {
`;
tbody.appendChild(row);
});
+ initializeTooltips();
+ initializeModals();
updateDomainRequestsPagination(data.page, data.num_pages, data.has_previous, data.has_next);
currentPage = page;
@@ -1073,7 +1101,7 @@ document.addEventListener('DOMContentLoaded', function() {
prevPageItem.innerHTML = `
@@ -1103,7 +1131,7 @@ document.addEventListener('DOMContentLoaded', function() {
`;
diff --git a/src/registrar/assets/js/uswds-edited.js b/src/registrar/assets/js/uswds-edited.js
index 60f286bb5..ac3e7d8d4 100644
--- a/src/registrar/assets/js/uswds-edited.js
+++ b/src/registrar/assets/js/uswds-edited.js
@@ -5336,36 +5336,6 @@ modal = {
item.addEventListener("click", toggleModal);
});
});
-
- // Check for the presence of the testerPixel element
- const intervalId = setInterval(() => {
- console.log('testing');
- const testerPixel = document.querySelector('.testerPixel');
- if (testerPixel) {
- clearInterval(intervalId);
- console.log('found it');
-
-
- document.querySelectorAll('.late-loading-modal-trigger').forEach(item => {
- // Turn anchor links into buttons because of
- // VoiceOver on Safari
- if (item.nodeName === "A") {
- item.setAttribute("role", "button");
- item.addEventListener("click", e => e.preventDefault());
- }
-
- // Can uncomment when aria-haspopup="dialog" is supported
- // https://a11ysupport.io/tech/aria/aria-haspopup_attribute
- // Most screen readers support aria-haspopup, but might announce
- // as opening a menu if "dialog" is not supported.
- // item.setAttribute("aria-haspopup", "dialog");
-
- item.addEventListener("click", toggleModal);
- });
-
-
- }
- }, 100); // Check every 100ms
},
teardown(root) {
selectOrMatches(MODAL, root).forEach(modalWindow => {
@@ -5384,6 +5354,7 @@ modal = {
}
};
module.exports = modal;
+window.modal = modal;
},{"../../uswds-core/src/js/config":35,"../../uswds-core/src/js/utils/focus-trap":47,"../../uswds-core/src/js/utils/scrollbar-width":51,"../../uswds-core/src/js/utils/select-or-matches":52}],29:[function(require,module,exports){
"use strict";
@@ -5854,7 +5825,7 @@ const {
prefix: PREFIX
} = require("../../uswds-core/src/js/config");
const isElementInViewport = require("../../uswds-core/src/js/utils/is-in-viewport");
-const TOOLTIP = `.${PREFIX}-tooltip`;
+const TOOLTIP = `svg.${PREFIX}-tooltip`;
const TOOLTIP_TRIGGER = `.${PREFIX}-tooltip__trigger`;
const TOOLTIP_TRIGGER_CLASS = `${PREFIX}-tooltip__trigger`;
const TOOLTIP_CLASS = `${PREFIX}-tooltip`;
@@ -6188,6 +6159,7 @@ const tooltip = behavior({
hide: hideToolTip
});
module.exports = tooltip;
+window.tooltip = tooltip;
},{"../../uswds-core/src/js/config":35,"../../uswds-core/src/js/utils/behavior":45,"../../uswds-core/src/js/utils/is-in-viewport":48,"../../uswds-core/src/js/utils/select-or-matches":52}],34:[function(require,module,exports){
"use strict";
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index f28d28de1..5eb69438e 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -45,6 +45,7 @@
{% block css %}
+
{% endblock %}
@@ -67,7 +68,6 @@
-
Skip to main content
{% if not IS_PRODUCTION %}
|