HTML5FrontEnd: Fix iPad check and iOS isMobile #1901
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -92,8 +92,7 @@ class HTML5FrontEnd | |||
|
|
|||
| private function getIsMobile():Bool | |||
| { | |||
| return [ANDROID, BLACKBERRY, WINDOWS_PHONE, | |||
| IOS(IPHONE), IOS(IPAD), IOS(IPOD)].contains(platform); | |||
| return Type.enumConstructor(platform) == "IOS" || [ANDROID, BLACKBERRY, WINDOWS_PHONE].contains(platform); | |||
There was a problem hiding this comment.
This seems a bit hacky.. How about using a switch-case:
return switch (platform) {
case ANDROID:
case BLACKBERRY:
...
case IOS(_):
true;
default:
false;
}There was a problem hiding this comment.
Nah, switch-case doesn't work. It still returns false no matter what.
There was a problem hiding this comment.
I'll take that back. It works now. My bad :P
|
Looks good, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[IOS(IPHONE), IOS(IPAD), IOS(IPOD)].contains(IOS(IPAD)) == falseso that's my workaround