Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2013-03-28 03:37:22 +0400
committermattab <matthieu.aubry@gmail.com>2013-03-28 03:37:22 +0400
commit158c2150f5f2e13ece459b8d131244c11b763997 (patch)
tree7d26d52017b95809cbe9d4be05a70822f10ff22e
parentbd20b29dba41cad5cbf6aee7bba398a78729d5a3 (diff)
JSlint piwik.js
-rw-r--r--js/piwik.js69
1 files changed, 35 insertions, 34 deletions
diff --git a/js/piwik.js b/js/piwik.js
index 5ad1d9dc14..d22d65432b 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -396,7 +396,7 @@ if (typeof JSON2 !== 'object') {
addEventListener, attachEvent, removeEventListener, detachEvent, disableCookies,
cookie, domain, readyState, documentElement, doScroll, title, text,
location, top, document, referrer, parent, links, href, protocol, name, GearsFactory,
- performance, mozPerformance, msPerformance, webkitPerformance, timing, requestStart,
+ performance, mozPerformance, msPerformance, webkitPerformance, timing, requestStart,
responseEnd, event, which, button, srcElement, type, target,
parentNode, tagName, hostname, className,
userAgent, cookieEnabled, platform, mimeTypes, enabledPlugin, javaEnabled,
@@ -422,6 +422,7 @@ if (typeof JSON2 !== 'object') {
setCookieNamePrefix, setCookieDomain, setCookiePath, setVisitorIdCookie,
setVisitorCookieTimeout, setSessionCookieTimeout, setReferralCookieTimeout,
setConversionAttributionFirstReferrer,
+ disablePerformanceTracking, setGenerationTimeMs,
doNotTrack, setDoNotTrack, msDoNotTrack,
addListener, enableLinkTracking, setLinkTrackingTimer,
setHeartBeatTimer, killFrame, redirectFile, setCountPreRendered,
@@ -461,9 +462,9 @@ if (typeof Piwik !== 'object') {
navigatorAlias = navigator,
screenAlias = screen,
windowAlias = window,
-
- /* performance timing */
- performanceAlias = windowAlias.performance || windowAlias.mozPerformance || windowAlias.msPerformance || windowAlias.webkitPerformance,
+
+ /* performance timing */
+ performanceAlias = windowAlias.performance || windowAlias.mozPerformance || windowAlias.msPerformance || windowAlias.webkitPerformance,
/* DOM Ready */
hasLoaded = false,
@@ -1161,12 +1162,12 @@ if (typeof Piwik !== 'object') {
// Life of the referral cookie (in milliseconds)
configReferralCookieTimeout = 15768000000, // 6 months
-
- // Is performance tracking enabled
- configPerformanceTrackingEnabled = true,
-
- // Generation time set from the server
- configPerformanceGenerationTime = 0,
+
+ // Is performance tracking enabled
+ configPerformanceTrackingEnabled = true,
+
+ // Generation time set from the server
+ configPerformanceGenerationTime = 0,
// Custom Variables read from cookie, scope "visit"
customVariables = false,
@@ -1746,14 +1747,14 @@ if (typeof Piwik !== 'object') {
setCookie(cvarname, JSON2.stringify(customVariables), configSessionCookieTimeout, configCookiePath, configCookieDomain);
}
-
- // performance tracking
- if (configPerformanceTrackingEnabled && configPerformanceGenerationTime) {
- request += '&generation_time_ms=' + configPerformanceGenerationTime;
- } else if (configPerformanceTrackingEnabled && performanceAlias && performanceAlias.timing
- && performanceAlias.timing.requestStart && performanceAlias.timing.responseEnd) {
- request += '&generation_time_ms=' + (performanceAlias.timing.responseEnd - performanceAlias.timing.requestStart);
- }
+
+ // performance tracking
+ if (configPerformanceTrackingEnabled && configPerformanceGenerationTime) {
+ request += '&generation_time_ms=' + configPerformanceGenerationTime;
+ } else if (configPerformanceTrackingEnabled && performanceAlias && performanceAlias.timing
+ && performanceAlias.timing.requestStart && performanceAlias.timing.responseEnd) {
+ request += '&generation_time_ms=' + (performanceAlias.timing.responseEnd - performanceAlias.timing.requestStart);
+ }
// update cookies
setVisitorIdCookie(uuid, createTs, visitCount, nowTs, lastVisitTs, isDefined(currentEcommerceOrderTs) && String(currentEcommerceOrderTs).length ? currentEcommerceOrderTs : lastEcommerceOrderTs);
@@ -2722,22 +2723,22 @@ if (typeof Piwik !== 'object') {
}
},
- /**
- * Disable automatic performance tracking
- */
- disablePerformanceTracking: function () {
- configPerformanceTrackingEnabled = false;
- },
-
- /**
- * Set the server generation time.
- * If set, the browser's performance.timing API in not used anymore to determine the time.
- *
- * @param int generationTime
- */
- setGenerationTimeMs: function(generationTime) {
- configPerformanceGenerationTime = parseInt(generationTime, 10);
- },
+ /**
+ * Disable automatic performance tracking
+ */
+ disablePerformanceTracking: function () {
+ configPerformanceTrackingEnabled = false;
+ },
+
+ /**
+ * Set the server generation time.
+ * If set, the browser's performance.timing API in not used anymore to determine the time.
+ *
+ * @param int generationTime
+ */
+ setGenerationTimeMs: function(generationTime) {
+ configPerformanceGenerationTime = parseInt(generationTime, 10);
+ },
/**
* Set heartbeat (in seconds)