diff -r 8370c624fc44 -r 662e8fc90c14 src/ztfy/myams/resources/js/myams.js --- a/src/ztfy/myams/resources/js/myams.js Mon Dec 14 09:14:30 2020 +0100 +++ b/src/ztfy/myams/resources/js/myams.js Mon Jan 15 11:58:06 2024 +0100 @@ -5750,11 +5750,15 @@ * Log current or specified page load */ logPageview: function(url) { - if (typeof(globals._gaq) === 'undefined') { - return; - } var location = globals.window.location; - globals._gaq.push(['_trackPageview', url || location.pathname + location.hash]); + if (typeof(globals._gaq) !== 'undefined') { + globals._gaq.push(['_trackPageview', url || location.pathname + location.hash]); + } else if (typeof(globals.gtag) !== 'undefined') { + gtag('event', 'page_view', { + page_title: globals.window.title, + page_location: url || location.pathname + location.hash + }); + } }, /** @@ -5765,15 +5769,26 @@ * @param label */ logEvent: function(category, action, label) { - if (typeof(globals._gaq) === 'undefined') { - return; - } - if (typeof(category) === 'object') { - action = category.action; - label = category.label; - category = category.category; - } - globals._gaq.push(['_trackEvent', category, action, label]); + if (typeof(globals._gaq) !== 'undefined') { + if (typeof (category) === 'object') { + action = category.action; + label = category.label; + category = category.category; + } + globals._gaq.push(['_trackEvent', category, action, label]); + } else if (typeof(globals.gtag !== 'undefined')) { + if (typeof(category) === 'object') { + gtag('event', category.category, { + action: category.action, + label: category.label + }); + } else { + gtag('event', category, { + action: action, + label: label + }); + } + } } };