mirror of
https://github.com/kremalicious/umami.git
synced 2024-12-18 07:13:37 +01:00
merge
This commit is contained in:
commit
3bdfc2fd45
@ -38,7 +38,7 @@ export default function ActiveUsers({ websiteId, className }) {
|
||||
<animated.div className={styles.value}>
|
||||
{props.x.interpolate(x => x.toFixed(0))}
|
||||
</animated.div>
|
||||
<div>{`current vistor${count !== 1 ? 's' : ''}`}</div>
|
||||
<div>{`current visitor${count !== 1 ? 's' : ''}`}</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
25
lib/web.js
25
lib/web.js
@ -48,13 +48,26 @@ export const hook = (_this, method, callback) => {
|
||||
};
|
||||
|
||||
export const doNotTrack = () => {
|
||||
if (window.doNotTrack || navigator.doNotTrack || navigator.msDoNotTrack || 'msTrackingProtectionEnabled' in window.external) {
|
||||
if (window.doNotTrack == "1" || navigator.doNotTrack == "yes" || navigator.doNotTrack == "1" || navigator.msDoNotTrack == "1" || window.external.msTrackingProtectionEnabled()) {
|
||||
return true
|
||||
if (
|
||||
window.doNotTrack ||
|
||||
navigator.doNotTrack ||
|
||||
navigator.msDoNotTrack ||
|
||||
'msTrackingProtectionEnabled' in window.external
|
||||
) {
|
||||
if (
|
||||
window.doNotTrack == '1' ||
|
||||
navigator.doNotTrack == 'yes' ||
|
||||
navigator.doNotTrack == '1' ||
|
||||
navigator.msDoNotTrack == '1' ||
|
||||
(window.external &&
|
||||
window.external.msTrackingProtectionEnabled &&
|
||||
window.external.msTrackingProtectionEnabled())
|
||||
) {
|
||||
return true;
|
||||
} else {
|
||||
return false
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
return false
|
||||
return false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user