diff options
author | 2020-06-10 17:22:02 +0200 | |
---|---|---|
committer | 2020-06-10 17:22:02 +0200 | |
commit | f3fa2c5b3726592be36d161afff2c2343a107f58 (patch) | |
tree | 9fbfef99a4c21610594228dba1b7d47485272ef4 | |
parent | Add support for keeping the featured status (diff) | |
parent | Fix default link handling in Skype recipe (diff) | |
download | ferdium-recipes-f3fa2c5b3726592be36d161afff2c2343a107f58.tar.gz ferdium-recipes-f3fa2c5b3726592be36d161afff2c2343a107f58.tar.zst ferdium-recipes-f3fa2c5b3726592be36d161afff2c2343a107f58.zip |
Merge pull request #199 from dannyqiu/fix/skype-default-link-handling
Fix default link handling in Skype recipe
-rw-r--r-- | all.json | 2 | ||||
-rw-r--r-- | archives/skype.tar.gz | bin | 74347 -> 74299 bytes | |||
-rw-r--r-- | uncompressed/skype/package.json | 2 | ||||
-rw-r--r-- | uncompressed/skype/webview.js | 9 |
4 files changed, 4 insertions, 9 deletions
@@ -796,7 +796,7 @@ | |||
796 | "featured": false, | 796 | "featured": false, |
797 | "id": "skype", | 797 | "id": "skype", |
798 | "name": "Skype", | 798 | "name": "Skype", |
799 | "version": "1.4.0", | 799 | "version": "1.4.1", |
800 | "icons": { | 800 | "icons": { |
801 | "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/skype/icon.png", | 801 | "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/skype/icon.png", |
802 | "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/skype/icon.svg" | 802 | "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/skype/icon.svg" |
diff --git a/archives/skype.tar.gz b/archives/skype.tar.gz index 5c6a5fd..a1bc4a8 100644 --- a/archives/skype.tar.gz +++ b/archives/skype.tar.gz | |||
Binary files differ | |||
diff --git a/uncompressed/skype/package.json b/uncompressed/skype/package.json index 7437d65..9b4e168 100644 --- a/uncompressed/skype/package.json +++ b/uncompressed/skype/package.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "id": "skype", | 2 | "id": "skype", |
3 | "name": "Skype", | 3 | "name": "Skype", |
4 | "version": "1.4.0", | 4 | "version": "1.4.1", |
5 | "description": "Skype", | 5 | "description": "Skype", |
6 | "main": "index.js", | 6 | "main": "index.js", |
7 | "author": "Stefan Malzner <stefan@adlk.io>", | 7 | "author": "Stefan Malzner <stefan@adlk.io>", |
diff --git a/uncompressed/skype/webview.js b/uncompressed/skype/webview.js index 63f445c..93a3613 100644 --- a/uncompressed/skype/webview.js +++ b/uncompressed/skype/webview.js | |||
@@ -88,10 +88,10 @@ module.exports = (Franz, settings) => { | |||
88 | 88 | ||
89 | if (link || button) { | 89 | if (link || button) { |
90 | const url = link ? link.getAttribute('href') : button.getAttribute('title'); | 90 | const url = link ? link.getAttribute('href') : button.getAttribute('title'); |
91 | event.preventDefault(); | ||
92 | event.stopPropagation(); | ||
93 | 91 | ||
94 | if (url.includes('views/imgpsh_fullsize_anim')) { | 92 | if (url.includes('views/imgpsh_fullsize_anim')) { |
93 | event.preventDefault(); | ||
94 | event.stopPropagation(); | ||
95 | let win = new BrowserWindow({ | 95 | let win = new BrowserWindow({ |
96 | width: 800, | 96 | width: 800, |
97 | height: window.innerHeight, | 97 | height: window.innerHeight, |
@@ -101,11 +101,6 @@ module.exports = (Franz, settings) => { | |||
101 | } | 101 | } |
102 | }); | 102 | }); |
103 | win.loadURL(url); | 103 | win.loadURL(url); |
104 | win.on('closed', () => { | ||
105 | win = null; | ||
106 | }); | ||
107 | } else { | ||
108 | window.open(url); | ||
109 | } | 104 | } |
110 | } | 105 | } |
111 | }, true); | 106 | }, true); |