Skip to content

Jsdom 30 upgrade #33

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

Merged
Ovski4 merged 4 commits into from
Mar 24, 2026
Merged

Jsdom 30 upgrade #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44783f7
Update jsdom to version 30
Ovski4 Mar 23, 2026
ddeed89
Add test to cover behaviour without window object
Ovski4 Mar 24, 2026
256ce14
Update packages
Ovski4 Mar 24, 2026
d2d6a9b
Drop unnecessary import
Ovski4 Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,5 +274,5 @@ gem push jekyll-tabs-{version_here}.gem
### Run the tests

```bash
npm test
npm run test
```
2 changes: 1 addition & 1 deletion docs/tabs.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions js/jekyllTabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ interface Configuration {
copyToClipboardSettings: CopyToClipboardSettings;
}

const init = (overriddenConfiguration: Partial<Configuration> = {}) => {
const init = (
overriddenConfiguration: Partial<Configuration> = {},
windowObject: Window = window,
historyObject: History = history,
) => {

const defaultConfiguration: Configuration = {
syncTabsWithSameLabels: false,
Expand Down Expand Up @@ -53,7 +57,7 @@ const init = (overriddenConfiguration: Partial<Configuration> = {}) => {
handleTabClicked(link);

if (configuration.activateTabFromUrl) {
updateUrlWithActiveTab(link);
updateUrlWithActiveTab(link, windowObject, historyObject);
}

if (configuration.syncTabsWithSameLabels) {
Expand All @@ -73,7 +77,7 @@ const init = (overriddenConfiguration: Partial<Configuration> = {}) => {
}

if (configuration.activateTabFromUrl) {
activateTabFromUrl();
activateTabFromUrl(windowObject);
}
};

Expand Down
18 changes: 11 additions & 7 deletions js/tabsHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ const copyToClipboard = (text: string, callBack: () => void) => {
* For example, considering url http://your-jekyll-website.com/some-page/?active_tab=tab-2#my_tabs
* Then the tabs with name 'my_tabs' would see tab with label 'tab 2' automatically open.
*/
const activateTabFromUrl = () => {
const tabsAnchor = window.location.hash?.substring(1);
const activateTabFromUrl = (windowObject: Window) => {
const tabsAnchor = windowObject.location.hash?.substring(1);

if (!tabsAnchor) {
return;
Expand All @@ -98,7 +98,7 @@ const activateTabFromUrl = () => {
return;
}

const urlParams = new URLSearchParams(window.location.search);
const urlParams = new URLSearchParams(windowObject.location.search);
const tabIdToActivate = urlParams.get('active_tab');

if (!tabIdToActivate) {
Expand All @@ -117,15 +117,19 @@ const activateTabFromUrl = () => {
/**
* Update the url when clicking on a tab. See method activateTabFromUrl above.
*/
const updateUrlWithActiveTab = (link: HTMLAnchorElement) => {
const updateUrlWithActiveTab = (
link: HTMLAnchorElement,
windowObject: Window,
historyObject: History,
) => {
const liTab = link.parentNode as HTMLLIElement;
const ulTab = liTab.parentNode as HTMLUListElement;

const searchParams = new URLSearchParams(window.location.search);
const searchParams = new URLSearchParams(windowObject.location.search);
searchParams.set('active_tab', liTab.id);

const updatedUrl = window.location.pathname + '?' + searchParams.toString() + '#' + ulTab.id;
history.replaceState(null, '', updatedUrl);
const updatedUrl = windowObject.location.pathname + '?' + searchParams.toString() + '#' + ulTab.id;
historyObject.replaceState(null, '', updatedUrl);
};

/**
Expand Down
Loading
Loading