Skip to content

Change the isIOSOlderThan10 so it doesn't catch Chrome Webview #3852

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
merged 3 commits into from
Nov 8, 2018
Merged

Change the isIOSOlderThan10 so it doesn't catch Chrome Webview #3852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22255f8
add failing test for chrome webview
Oct 30, 2018
e4d5365
Fixing lint errors
Oct 30, 2018
3198bd6
Fix regex for isIOSOlderThan10 so that it doesn't catch Chrome Webview
Nov 8, 2018
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 src/utils/device.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ module.exports.isLandscape = function () {
* Check if device is iOS and older than version 10.
*/
module.exports.isIOSOlderThan10 = function (userAgent) {
return /(iphone|ipod|ipad).*os.(7|8|9)/i.test(userAgent);
return /(iphone|ipod|ipad).*os.(7_|8_|9_)/i.test(userAgent);
};

/**
Expand Down
5 changes: 5 additions & 0 deletions tests/utils/device.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ suite('isIOSOlderThan10', function () {
assert.notOk(device.isIOSOlderThan10(v11));
assert.notOk(device.isIOSOlderThan10(v12));
});

test('is false for webview', function () {
var chromeiOS = `Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/70.0.3538.60 Mobile/15E148 Safari/605.1`;
assert.notOk(device.isIOSOlderThan10(chromeiOS));
});
});

suite('environment', function () {
Expand Down