${value}
@@ -559,7 +577,7 @@
`;
});
}
-
+
$container.html(html);
}
@@ -571,14 +589,14 @@
const $filter = $(this).parent();
const filter = $filter.data('filter');
const value = $filter.data('value');
-
+
if (activeFilters[filter]) {
activeFilters[filter] = activeFilters[filter].filter(v => v !== value);
if (activeFilters[filter].length === 0) {
delete activeFilters[filter];
}
}
-
+
updateActiveFiltersDisplay();
updateClearButtonVisibility();
currentPage = 1;
@@ -591,16 +609,16 @@
function handleProfileClick(e) {
e.preventDefault();
e.stopPropagation();
-
+
const $card = $(this).closest('.hvac-trainer-card');
-
+
// Don't allow clicks on Champion cards
if ($card.hasClass('hvac-champion-card')) {
return false;
}
-
+
const profileId = $(this).data('profile-id');
-
+
// Get trainer data from the card
const trainerData = {
profile_id: profileId,
@@ -616,9 +634,9 @@
training_locations: 'On-site, Remote',
upcoming_events: [] // Mock empty events
};
-
+
// Extract certifications from card badges
- $card.find('.hvac-trainer-cert-badge').each(function() {
+ $card.find('.hvac-trainer-cert-badge').each(function () {
const certText = $(this).text().trim();
if (certText && certText !== 'HVAC Trainer') {
trainerData.certifications.push({
@@ -627,7 +645,7 @@
});
}
});
-
+
showTrainerModal(trainerData);
}
@@ -638,52 +656,52 @@
function showTrainerModal(trainer) {
// Update modal title
$trainerModal.find('.hvac-modal-title').text(trainer.name);
-
+
// Update profile image
const $imgContainer = $trainerModal.find('.hvac-modal-image');
let imageHtml = '';
-
+
if (trainer.profile_image) {
imageHtml = `
`;
} else {
imageHtml = '
';
}
-
+
// Add mQ badge overlay for certified trainers
let hasTrainerCert = false;
if (trainer.certifications && trainer.certifications.length > 0) {
// Check if any certification is a trainer certification
- hasTrainerCert = trainer.certifications.some(cert =>
- cert.type.toLowerCase().includes('trainer') ||
+ hasTrainerCert = trainer.certifications.some(cert =>
+ cert.type.toLowerCase().includes('trainer') ||
cert.type === 'measureQuick Certified Trainer'
);
- } else if (trainer.certification_type === 'Certified measureQuick Trainer' ||
- trainer.certification_type === 'measureQuick Certified Trainer') {
+ } else if (trainer.certification_type === 'Certified measureQuick Trainer' ||
+ trainer.certification_type === 'measureQuick Certified Trainer') {
// Fallback for legacy single certification
hasTrainerCert = true;
}
-
+
if (hasTrainerCert) {
imageHtml += '
';
}
-
+
$imgContainer.html(imageHtml);
-
+
// Update profile info
$trainerModal.find('.hvac-modal-location').text(`${trainer.city}, ${trainer.state}`);
-
+
// Update certifications section - handle both single and multiple certifications
const $certContainer = $trainerModal.find('.hvac-modal-certification-badges');
let certHtml = '';
-
+
if (trainer.certifications && trainer.certifications.length > 0) {
// Show multiple certifications as badges
- trainer.certifications.forEach(function(cert) {
+ trainer.certifications.forEach(function (cert) {
const badgeClass = cert.type.toLowerCase()
.replace('measurequick certified ', '')
.replace(/\s+/g, '-');
const legacyClass = cert.status === 'legacy' ? ' hvac-cert-legacy' : '';
-
+
certHtml += `
${cert.type}`;
});
} else if (trainer.certification_type && trainer.certification_type !== 'HVAC Trainer') {
@@ -696,34 +714,34 @@
// Default fallback
certHtml = '
HVAC Trainer';
}
-
+
$certContainer.html(certHtml);
-
+
$trainerModal.find('.hvac-modal-business').text(trainer.business_type || '');
$trainerModal.find('.hvac-modal-events span').text(trainer.event_count || 0);
-
+
// Update training details
$trainerModal.find('.hvac-training-formats').text(trainer.training_formats || 'Various');
$trainerModal.find('.hvac-training-locations').text(trainer.training_locations || 'On-site');
-
+
// Show loading state for events
$trainerModal.find('.hvac-events-list').html('
Loading upcoming events...');
-
+
// Set hidden fields for contact form
$contactForm.find('input[name="trainer_id"]').val(trainer.user_id || '');
$contactForm.find('input[name="trainer_profile_id"]').val(trainer.profile_id);
-
+
// Reset contact form
$contactForm[0].reset();
$('.hvac-form-message').hide();
-
+
// Show modal
$trainerModal.fadeIn(300);
-
+
// Fetch upcoming events via AJAX
fetchUpcomingEvents(trainer.profile_id);
}
-
+
/**
* Fetch upcoming events for a trainer via AJAX
*/
@@ -732,16 +750,16 @@
$trainerModal.find('.hvac-events-list').html('
No upcoming events scheduled');
return;
}
-
+
$.post(hvac_find_trainer.ajax_url, {
action: 'hvac_get_trainer_upcoming_events',
nonce: hvac_find_trainer.nonce,
profile_id: profileId
- }, function(response) {
+ }, function (response) {
if (response.success && response.data.events) {
let eventsHtml = '';
if (response.data.events.length > 0) {
- response.data.events.forEach(function(event) {
+ response.data.events.forEach(function (event) {
eventsHtml += `
${event.title} - ${event.date}`;
});
} else {
@@ -751,7 +769,7 @@
} else {
$trainerModal.find('.hvac-events-list').html('
No upcoming events scheduled');
}
- }).fail(function() {
+ }).fail(function () {
$trainerModal.find('.hvac-events-list').html('
Unable to load events');
});
}
@@ -761,24 +779,24 @@
*/
function handleContactSubmit(e) {
e.preventDefault();
-
+
const $form = $(this);
const $submitBtn = $form.find('.hvac-form-submit');
const $successMsg = $form.find('.hvac-form-success');
const $errorMsg = $form.find('.hvac-form-error');
const originalText = $submitBtn.text();
-
+
$submitBtn.text('Sending...').prop('disabled', true);
-
+
// For now, just show success message
- setTimeout(function() {
+ setTimeout(function () {
$successMsg.show();
$errorMsg.hide();
$form[0].reset();
$submitBtn.text(originalText).prop('disabled', false);
-
+
// Hide success message after 5 seconds
- setTimeout(function() {
+ setTimeout(function () {
$successMsg.fadeOut();
}, 5000);
}, 1000);
@@ -789,9 +807,9 @@
*/
function handleSearch() {
const searchTerm = $('.hvac-search-input').val();
-
+
if (isLoading) return;
-
+
updateClearButtonVisibility();
currentPage = 1;
loadFilteredTrainers();
@@ -804,26 +822,26 @@
e.preventDefault();
currentPage = $(this).data('page');
loadFilteredTrainers();
-
+
// Scroll to top of trainer grid
$('html, body').animate({
scrollTop: $('.hvac-trainer-directory-container').offset().top - 100
}, 500);
}
-
+
/**
* Load filtered trainers via AJAX
*/
function loadFilteredTrainers() {
if (isLoading) return;
-
+
isLoading = true;
const $container = $('.hvac-trainer-grid');
let $pagination = $('.hvac-pagination');
-
+
// Show loading state
$container.addClass('hvac-loading');
-
+
// Prepare data
const data = {
action: 'hvac_filter_trainers',
@@ -833,9 +851,9 @@
// Flatten the activeFilters for PHP processing
...activeFilters
};
-
+
// Make AJAX request
- $.post(hvac_find_trainer.ajax_url, data, function(response) {
+ $.post(hvac_find_trainer.ajax_url, data, function (response) {
if (response.success) {
// Our PHP returns an array of trainer card HTML
if (response.data.trainers && response.data.trainers.length > 0) {
@@ -844,12 +862,12 @@
} else {
$container.html('
No trainers found matching your criteria. Please try adjusting your filters.
');
}
-
+
// Update count display if exists
if (response.data.count !== undefined) {
$('.hvac-trainer-count').text(response.data.count + ' trainers found');
}
-
+
// Simple pagination logic - show/hide existing pagination based on results
if (response.data.count > 12) { // Assuming 12 per page
if ($pagination.length > 0) {
@@ -864,9 +882,9 @@
console.error('Failed to load trainers:', response);
$container.html('
Error loading trainers. Please try again.
');
}
- }).fail(function(xhr) {
+ }).fail(function (xhr) {
console.error('AJAX error:', xhr);
- }).always(function() {
+ }).always(function () {
isLoading = false;
$container.removeClass('hvac-loading');
});
@@ -878,12 +896,12 @@
function closeModals() {
// Remove the modal-active class and force hide styles
$filterModal.removeClass('modal-active');
-
+
// Force hide styles with !important
$filterModal[0].style.setProperty('display', 'none', 'important');
$filterModal[0].style.setProperty('visibility', 'hidden', 'important');
$filterModal[0].style.setProperty('opacity', '0', 'important');
-
+
$trainerModal.fadeOut(300);
}
@@ -901,7 +919,7 @@
timeout = setTimeout(later, wait);
};
}
-
+
/**
* Clear all filters
*/
@@ -913,21 +931,21 @@
currentPage = 1;
loadFilteredTrainers();
}
-
+
/**
* Update clear button visibility
*/
function updateClearButtonVisibility() {
const hasFilters = Object.keys(activeFilters).length > 0;
const hasSearch = $('.hvac-search-input').val().trim() !== '';
-
+
if (hasFilters || hasSearch) {
$('.hvac-clear-filters').show();
} else {
$('.hvac-clear-filters').hide();
}
}
-
+
/**
* Handle direct profile URL access
* When someone accesses /find-a-trainer/profile/{id}, show the profile and handle interactions
@@ -936,19 +954,19 @@
// Check if we're showing a direct profile
if (hvac_find_trainer.show_direct_profile && hvac_find_trainer.direct_profile_id) {
console.log('Direct profile access detected for profile ID:', hvac_find_trainer.direct_profile_id);
-
+
// Update page title in browser
if (document.title.includes('Find a Trainer')) {
document.title = document.title.replace('Find a Trainer', 'Trainer Profile');
}
-
+
// Bind contact trainer button
- $(document).on('click', '.hvac-contact-trainer-btn', function(e) {
+ $(document).on('click', '.hvac-contact-trainer-btn', function (e) {
e.preventDefault();
const profileId = $(this).data('profile-id');
showTrainerModal(profileId);
});
-
+
// Update URL without page reload for clean sharing
const currentUrl = window.location.href;
if (currentUrl.includes('/profile/') && window.history && window.history.replaceState) {
@@ -957,7 +975,7 @@
}
}
}
-
+
// Expose showTrainerModal globally for MapGeo integration
window.showTrainerModal = showTrainerModal;
diff --git a/assets/js/mapgeo-safety.js b/assets/js/mapgeo-safety.js
index 6760c303..11c90286 100644
--- a/assets/js/mapgeo-safety.js
+++ b/assets/js/mapgeo-safety.js
@@ -67,9 +67,22 @@
if (isCritical) {
log('[MapGeo Safety] Monitoring critical resource:', src);
+ // Use Performance API to check if already loaded
+ if (performance.getEntriesByName(src).length > 0) {
+ log('[MapGeo Safety] Resource already loaded (Performance API):', src);
+ this.resources.set(src, 'loaded');
+ return;
+ }
+
const timeoutId = setTimeout(() => {
- error('[MapGeo Safety] Resource timeout:', src);
- this.handleResourceFailure(src);
+ // Double check with Performance API before failing
+ if (performance.getEntriesByName(src).length > 0) {
+ log('[MapGeo Safety] Resource loaded just in time (Performance API):', src);
+ this.resources.set(src, 'loaded');
+ } else {
+ error('[MapGeo Safety] Resource timeout:', src);
+ this.handleResourceFailure(src);
+ }
}, config.timeout);
script.addEventListener('load', () => {
@@ -210,33 +223,70 @@
class DOMReadySafety {
constructor() {
this.setupSafety();
+ this.checkjQueryWithRetry();
}
setupSafety() {
// Intercept jQuery ready calls that might contain MapGeo code
if (typeof jQuery !== 'undefined') {
- const originalReady = jQuery.fn.ready;
-
- jQuery.fn.ready = function (callback) {
- const wrappedCallback = function () {
- try {
- // Check if MapGeo elements exist before running
- const hasMapElements = document.querySelector(
- '.igm-map-container, [class*="mapgeo"], [id*="map-"]'
- );
-
- if (hasMapElements || !callback.toString().includes('map')) {
- return callback.apply(this, arguments);
- } else {
- log('[MapGeo Safety] Skipping map-related ready callback - no map elements found');
- }
- } catch (e) {
- error('[MapGeo Safety] Error in ready callback:', e);
+ this.wrapjQueryReady();
+ } else {
+ // If jQuery isn't loaded yet, define a property to trap it when it loads
+ Object.defineProperty(window, 'jQuery', {
+ configurable: true,
+ enumerable: true,
+ get: function () {
+ return this._jQuery;
+ },
+ set: function (val) {
+ this._jQuery = val;
+ // Once jQuery is set, wrap its ready function
+ if (val && val.fn && val.fn.ready) {
+ DOMReadySafety.prototype.wrapjQueryReady.call(this);
}
- };
+ }
+ });
+ }
+ }
- return originalReady.call(this, wrappedCallback);
+ wrapjQueryReady() {
+ const originalReady = jQuery.fn.ready;
+ // Guard to prevent double wrapping
+ if (originalReady._hvacWrapped) return;
+
+ jQuery.fn.ready = function (callback) {
+ const wrappedCallback = function () {
+ try {
+ // Check if MapGeo elements exist before running
+ const hasMapElements = document.querySelector(
+ '.igm-map-container, [class*="mapgeo"], [id*="map-"]'
+ );
+
+ if (hasMapElements || !callback.toString().includes('map')) {
+ return callback.apply(this, arguments);
+ } else {
+ log('[MapGeo Safety] Skipping map-related ready callback - no map elements found');
+ }
+ } catch (e) {
+ error('[MapGeo Safety] Error in ready callback:', e);
+ }
};
+ return originalReady.call(this, wrappedCallback);
+ };
+ jQuery.fn.ready._hvacWrapped = true;
+ log('[MapGeo Safety] jQuery.ready wrapped successfully');
+ }
+
+ checkjQueryWithRetry(attempts = 0) {
+ if (typeof window.jQuery !== 'undefined') {
+ log('[MapGeo Safety] jQuery detected successfully');
+ return;
+ }
+
+ if (attempts < 20) { // Retry for ~10 seconds (500ms * 20)
+ setTimeout(() => this.checkjQueryWithRetry(attempts + 1), 500);
+ } else {
+ log('[MapGeo Safety] jQuery not detected after multiple retries (might be loaded async later)');
}
}
}
diff --git a/includes/class-hvac-find-trainer-assets.php b/includes/class-hvac-find-trainer-assets.php
index 77b58ffe..b6a825e0 100644
--- a/includes/class-hvac-find-trainer-assets.php
+++ b/includes/class-hvac-find-trainer-assets.php
@@ -58,7 +58,7 @@ class HVAC_Find_Trainer_Assets {
add_action('wp_enqueue_scripts', [$this, 'enqueue_find_trainer_assets']);
add_action('wp_footer', [$this, 'add_find_trainer_inline_scripts']);
}
- }
+
/**
* Check if current page is find-a-trainer
diff --git a/includes/class-hvac-mapgeo-safety.php b/includes/class-hvac-mapgeo-safety.php
index 9e54e145..dbe9c3d1 100644
--- a/includes/class-hvac-mapgeo-safety.php
+++ b/includes/class-hvac-mapgeo-safety.php
@@ -66,7 +66,7 @@ class HVAC_MapGeo_Safety {
'hvac-mapgeo-safety',
HVAC_PLUGIN_URL . 'assets/js/mapgeo-safety.js',
array(),
- HVAC_PLUGIN_VERSION . '.fix1',
+ HVAC_PLUGIN_VERSION . '.fix2',
false // Load in head to catch errors early
);
@@ -75,7 +75,7 @@ class HVAC_MapGeo_Safety {
window.HVAC_MapGeo_Config = {
maxRetries: 3,
retryDelay: 2000,
- timeout: 10000,
+ timeout: 30000,
fallbackEnabled: true,
debugMode: ' . (defined('WP_DEBUG') && WP_DEBUG ? 'true' : 'false') . '
};
@@ -114,8 +114,10 @@ class HVAC_MapGeo_Safety {
var mapContainer = document.querySelector('.igm-map-container, [class*="mapgeo"], [id*="map-"]');
if (fallback && mapContainer) {
- mapContainer.style.display = 'none';
- fallback.style.display = 'block';
+ // Relaxed safety: Don't hide map on error immediately to allow debugging
+ // mapContainer.style.display = 'none';
+ // fallback.style.display = 'block';
+ console.warn('[HVAC MapGeo Safety] Error detected but keeping map visible for debugging.');
}
// Log to our error tracking
diff --git a/includes/find-trainer/class-hvac-mapgeo-integration.php b/includes/find-trainer/class-hvac-mapgeo-integration.php
index 28a94969..1baa42a2 100644
--- a/includes/find-trainer/class-hvac-mapgeo-integration.php
+++ b/includes/find-trainer/class-hvac-mapgeo-integration.php
@@ -30,6 +30,13 @@ class HVAC_MapGeo_Integration {
*/
private $map_id = '5872';
+ /**
+ * Stored clean markers to prevent IGM corruption
+ *
+ * @var array
+ */
+ private $clean_markers = [];
+
/**
* Get instance of this class
*
@@ -92,8 +99,8 @@ class HVAC_MapGeo_Integration {
add_action('wp_ajax_hvac_search_trainers', [$this, 'ajax_search_trainers']);
add_action('wp_ajax_nopriv_hvac_search_trainers', [$this, 'ajax_search_trainers']);
- // Add JavaScript to handle MapGeo marker clicks
- add_action('wp_footer', [$this, 'add_mapgeo_click_handlers']);
+ // Add JavaScript to handle MapGeo marker clicks - Priority 0 to ensure interceptor runs before localization
+ add_action('wp_footer', [$this, 'add_mapgeo_click_handlers'], 0);
}
/**
@@ -139,22 +146,27 @@ class HVAC_MapGeo_Integration {
}
}
- // If no existing markers, create them from trainer data
- if (!$has_existing_markers) {
- error_log('HVAC MapGeo: No existing markers found, creating from trainer data');
- $trainers = $this->get_geocoded_trainers();
- error_log('HVAC MapGeo: Found ' . count($trainers) . ' geocoded trainers');
+ // Always try to create markers from trainer data for our map
+ // The IGM plugin's "Other Data Sources" feature is not reliably
+ // serializing to the frontend, so we inject markers ourselves
+ error_log('HVAC MapGeo: Querying geocoded trainers for map injection');
+ $trainers = $this->get_geocoded_trainers();
+ error_log('HVAC MapGeo: Found ' . count($trainers) . ' geocoded trainers');
+
+ if (!empty($trainers)) {
+ $trainer_markers = array_values(array_filter(
+ array_map([$this, 'format_trainer_for_mapgeo'], $trainers)
+ ));
- if (!empty($trainers)) {
- $trainer_markers = array_values(array_filter(
- array_map([$this, 'format_trainer_for_mapgeo'], $trainers)
- ));
-
- if (!empty($trainer_markers)) {
- $meta['roundMarkers'] = $trainer_markers;
- error_log('HVAC MapGeo: Created ' . count($trainer_markers) . ' trainer markers');
- }
+ if (!empty($trainer_markers)) {
+ // Override/set roundMarkers with our trainer data
+ $meta['roundMarkers'] = $trainer_markers;
+ error_log('HVAC MapGeo: Injected ' . count($trainer_markers) . ' trainer markers into map');
+ } else {
+ error_log('HVAC MapGeo: WARNING - No markers could be formatted from trainers');
}
+ } else {
+ error_log('HVAC MapGeo: WARNING - No geocoded trainers found');
}
foreach ($marker_types as $marker_type) {
@@ -163,7 +175,12 @@ class HVAC_MapGeo_Integration {
foreach ($meta[$marker_type] as $index => &$marker) {
// Log marker structure for debugging
- error_log('HVAC MapGeo: Marker ' . $index . ' keys: ' . implode(', ', array_keys($marker)));
+ // error_log('HVAC MapGeo: Marker ' . $index . ' keys: ' . implode(', ', array_keys($marker)));
+
+ // Optimization: If marker already has our profile ID (we injected it), skip expensive lookup
+ if (isset($marker['hvac_profile_id'])) {
+ continue;
+ }
// Check if this marker has trainer data we can identify
$trainer_name = null;
@@ -210,7 +227,13 @@ class HVAC_MapGeo_Integration {
}
}
+ // Strategy D: Cache clean markers for footer injection override
+ if (isset($meta['roundMarkers'])) {
+ $this->clean_markers = $meta['roundMarkers'];
+ }
+
error_log('HVAC MapGeo: Map layout modification complete');
+
return $meta;
}
@@ -376,6 +399,10 @@ class HVAC_MapGeo_Integration {
}
+ /**
+ * Add JavaScript to handle MapGeo custom click actions
+ */
+
/**
* Add JavaScript to handle MapGeo custom click actions
*/
@@ -387,6 +414,40 @@ class HVAC_MapGeo_Integration {
?>