|
1 | | -/* Simple Analytics - Privacy friendly analytics (docs.simpleanalytics.com/script; 2022-09-05; 9974; v10) */ |
| 1 | +/* Simple Analytics - Privacy friendly analytics (docs.simpleanalytics.com/script; 2022-11-22; cdfd; v11) */ |
2 | 2 | /* eslint-env browser */ |
3 | 3 |
|
4 | 4 | (function ( |
|
63 | 63 | /(bot|spider|crawl)/i.test(userAgent) && !/(cubot)/i.test(userAgent); |
64 | 64 | var screen = window.screen; |
65 | 65 |
|
| 66 | + // Skip server side rendered pages on Cloudflare |
| 67 | + if (typeof window == "" + undefinedVar) return; |
| 68 | + |
66 | 69 | // Find the script element where options can be set on |
67 | 70 | var scriptElement = |
68 | 71 | doc.currentScript || doc.querySelector('script[src*="' + baseUrl + '"]'); |
|
77 | 80 | var args = [].slice.call(arguments); |
78 | 81 |
|
79 | 82 | // 2. Prepend log prefix |
80 | | - args.unshift("Simple Analytics: "); |
| 83 | + args.unshift("Simple Analytics:"); |
81 | 84 |
|
82 | 85 | // 3. Pass along arguments to console.warn |
83 | | - // Function.prototype.bind.call is needed for Internet Explorer |
84 | | - var log = Function.prototype.bind.call(con.warn, con); |
85 | | - log.apply(con, args); |
| 86 | + // Function.prototype.apply.call is needed for Internet Explorer |
| 87 | + return Function.prototype.apply.call(con.warn, con, args); |
86 | 88 | }; |
87 | 89 |
|
88 | 90 | var warnInFunction = function (name, error) { |
|
133 | 135 | return to; |
134 | 136 | }; |
135 | 137 |
|
| 138 | + var settings = window.sa_settings; |
| 139 | + var logSettings = settings || Object.values(overwriteOptions).length; |
| 140 | + |
136 | 141 | // Merge overwriteOptions with sa_settings |
137 | | - overwriteOptions = assign(overwriteOptions, window.sa_settings); |
| 142 | + overwriteOptions = assign(overwriteOptions, settings); |
| 143 | + |
| 144 | + if (logSettings) warn("Settings", overwriteOptions); |
138 | 145 |
|
139 | 146 | // Customers can skip data points |
140 | 147 | var ignoreMetrics = convertCommaSeparatedToArray( |
|
905 | 912 | } |
906 | 913 | })( |
907 | 914 | window, |
908 | | - {"saGlobal":INSTALL_OPTIONS.sa_global,"mode":INSTALL_OPTIONS.hash_mode ? 'hash' : null,"collectDnt":INSTALL_OPTIONS.collect_dnt}, |
| 915 | + {"hostname":INSTALL_OPTIONS.hostname,"collectDnt":typeof INSTALL_OPTIONS.collect_dnt === 'boolean' ? INSTALL_OPTIONS.collect_dnt : null,"mode":INSTALL_OPTIONS.hash_mode ? 'hash' : 'normal',"strictUtm":INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.strict_utm,"allowParams":INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.allow_url_parameters,"nonUniqueHostnames":INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.non_unique_hostnames,"ignorePages":INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.ignore_pages,"namespace":INSTALL_OPTIONS.overwrite_namespace && INSTALL_OPTIONS.namespace}, |
909 | 916 | INSTALL_OPTIONS.custom_domain || "queue.simpleanalyticscdn.com", |
910 | 917 | "", |
911 | | - "cloudflare_10", |
| 918 | + "cloudflare_11", |
912 | 919 | "sa" |
913 | 920 | ); |
0 commit comments