Performance timing API as default (#17427)

* switch domLoading to responseEnd * timing API as default * fix indentation * rebuilt piwik.js * Update piwik.js * rebuilt piwik.js * fix jslint error * rebuilt piwik.js * use isDefined * rebuilt piwik.js Co-authored-by: flamisz <[email protected]>
matomo-org · Apr 14, 2021 · 086874b · 086874b
1 parent 005528f
commit 086874b
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 41 deletions.
diff --git a/js/piwik.js b/js/piwik.js
@@ -3472,7 +3472,11 @@ if (typeof window.Matomo !== 'object') {
                     return request;
                 }
 
-                var performanceData = (typeof performanceAlias.getEntriesByType === 'function') && performanceAlias.getEntriesByType('navigation') ? performanceAlias.getEntriesByType('navigation')[0] : performanceAlias.timing;
+                var performanceData = (typeof performanceAlias.timing === 'object') && performanceAlias.timing ? performanceAlias.timing : undefined;
+
+                if (!performanceData) {
+                    performanceData = (typeof performanceAlias.getEntriesByType === 'function') && performanceAlias.getEntriesByType('navigation') ? performanceAlias.getEntriesByType('navigation')[0] : undefined;
+                }
 
                 if (!performanceData) {
                     return request;
@@ -3508,13 +3512,24 @@ if (typeof window.Matomo !== 'object') {
                     timings += '&pf_tfr=' + Math.round(performanceData.responseEnd - performanceData.responseStart);
                 }
 
-                if (performanceData.domInteractive && performanceData.domLoading) {
+                if (isDefined(performanceData.domLoading)) {
+                    if (performanceData.domInteractive && performanceData.domLoading) {
 
-                    if (performanceData.domInteractive < performanceData.domLoading) {
-                        return;
+                        if (performanceData.domInteractive < performanceData.domLoading) {
+                            return;
+                        }
+
+                        timings += '&pf_dm1=' + Math.round(performanceData.domInteractive - performanceData.domLoading);
                     }
+                } else {
+                    if (performanceData.domInteractive && performanceData.responseEnd) {
+
+                        if (performanceData.domInteractive < performanceData.responseEnd) {
+                            return;
+                        }
 
-                    timings += '&pf_dm1=' + Math.round(performanceData.domInteractive - performanceData.domLoading);
+                        timings += '&pf_dm1=' + Math.round(performanceData.domInteractive - performanceData.responseEnd);
+                    }
                 }
 
                 if (performanceData.domComplete && performanceData.domInteractive) {