Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Properly parse url and respect data-exclude-search attribute in tracker #2679

Merged
merged 8 commits into from
Apr 16, 2024
Merged

Fix: Properly parse url and respect data-exclude-search attribute in tracker #2679

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
09a75ec
Fixed region view. Closes #2648.
mikecao Apr 10, 2024
6973b2b
Pass start and end dates to filter component. Closes #2646.
mikecao Apr 10, 2024
7899289
fix case sensitivity for psql getValues
franciscao633 Apr 5, 2024
357c13f
Bump version v2.11.1
mikecao Apr 10, 2024
be7f69f
Merge pull request #2659 from umami-software/hotfix
mikecao Apr 10, 2024
bd36020
fix(tracker): Remove domain name when parsing url
CediGasser Apr 15, 2024
0225e63
fix(tracker): Respect excludeSearch consistently
CediGasser Apr 15, 2024
6c8fe9f
Merge branch 'dev' into fix/track-only-path-on-pushstate
mikecao Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/tracker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
document,
history,
} = window;
const { hostname, pathname, search } = location;
const { hostname, href } = location;
const { currentScript, referrer } = document;

if (!currentScript) return;
Expand Down Expand Up @@ -52,6 +52,12 @@
};

const parseURL = url => {
try {
const { pathname, search } = new URL(url);
url = pathname + search;
} catch {
/* empty */
}
return excludeSearch ? url.split('?')[0] : url;
};

Expand Down Expand Up @@ -238,7 +244,7 @@
};
}

let currentUrl = `${pathname}${search}`;
let currentUrl = parseURL(href);
let currentRef = referrer !== hostname ? referrer : '';
let title = document.title;
let cache;
Expand Down