Skip to content

franz-custom-website: fix click events when trapLinkClicks is enabled #613

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

Open
s-ol wants to merge 1 commit into
base: main
Choose a base branch
from
Open

franz-custom-website: fix click events when trapLinkClicks is enabled #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 recipes/franz-custom-website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "franz-custom-website",
"name": "Custom Website",
"version": "1.5.1",
"version": "1.6.0",
"license": "MIT",
"repository": "https://github.com/meetfranz/recipe-custom-website",
"config": {
Expand Down
9 changes: 3 additions & 6 deletions recipes/franz-custom-website/webview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const _path = _interopRequireDefault(require('path'));
module.exports = (Ferdium, settings) => {
Ferdium.injectCSS(_path.default.join(__dirname, 'style.css'));

if (settings.trapLinkClicks === true) return;

// TODO: See how this can be moved into the main ferdium app and sent as an ipc message for opening with a new window or same Ferdium recipe's webview based on user's preferences
document.addEventListener(
'click',
Expand All @@ -22,12 +24,7 @@ module.exports = (Ferdium, settings) => {
if (!Ferdium.isImage(link)) {
event.preventDefault();
event.stopPropagation();

if (settings.trapLinkClicks === true) {
window.location.href = url;
} else {
Ferdium.openNewWindow(url);
}
Ferdium.openNewWindow(url);
}
}
},
Expand Down