diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2018-12-11 16:26:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 16:26:13 +0300 |
| commit | 78bd3f42af64b97c56d02087669b7ece83460c38 (patch) | |
| tree | 6b7e8e135e131fc089a3471a9d440cc041495ba8 /js | |
| parent | 5d2531911891d23df34a851b2ac38c9c0269e69c (diff) | |
| parent | cacb3ce80d802f91314a0d8f17b3ed5a3a580cb0 (diff) | |
Merge pull request #1369 from nextcloud/backport/1368/stable13
[stable13] Backport/1364/stable14
Diffstat (limited to 'js')
| -rw-r--r-- | js/app.js | 2 | ||||
| -rw-r--r-- | js/simplewebrtc.js | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -261,7 +261,7 @@ break; case "EXTENSION_UNAVAILABLE": var extensionURL = null; - if (!!window.chrome && !!window.chrome.webstore) {// Chrome + if (window.chrome) {// Chrome extensionURL = 'https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol'; } diff --git a/js/simplewebrtc.js b/js/simplewebrtc.js index 182e43650..6e1b942a0 100644 --- a/js/simplewebrtc.js +++ b/js/simplewebrtc.js @@ -3886,9 +3886,10 @@ } if (window.navigator.userAgent.match('Chrome')) { - var chromever = parseInt(window.navigator.userAgent.match(/Chrome\/(.*) /)[1], 10); + var chromever = parseInt(window.navigator.userAgent.match(/Chrome\/(\d+)\./)[1], 10); var maxver = 33; - var isCef = !window.chrome.webstore; + // Chrome 71 dropped support for "window.chrome.webstore;". + var isCef = (chromever < 71) && !window.chrome.webstore; // "known" crash in chrome 34 and 35 on linux if (window.navigator.userAgent.match('Linux')) maxver = 35; |