javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(platform): account for larger tablets (#17630)

Browse Source 
* fix(platform): account for larger tablets

* lint files

* add utils file, clean up tests, add more tests

* update tests with extra desktop checks

* change window to win
This commit is contained in:
Liam DeBeasi
2019-03-15 13:43:39 -04:00
committed by GitHub
parent f6783dbd2e
commit 29dbd0770c
3 changed files with 178 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/utils/platform.ts
View File

@ -35,6 +35,10 @@ const isIOS = (win: Window) =>
const isAndroid = (win: Window) =>
testUserAgent(win, /android|sink/i);
const isAndroidTablet = (win: Window) => {
return isAndroid(win) && !testUserAgent(win, /mobile/i);
};
const isPhablet = (win: Window) => {
const width = win.innerWidth;
const height = win.innerHeight;
@ -50,8 +54,15 @@ const isTablet = (win: Window) => {
const height = win.innerHeight;
const smallest = Math.min(width, height);
const largest = Math.max(width, height);
return (smallest > 460 && smallest < 820) &&
(largest > 780 && largest < 1400);
return (
isIpad(win) ||
isAndroidTablet(win) ||
(
(smallest > 460 && smallest < 820) &&
(largest > 780 && largest < 1400)
)
);
};
const isMobile = (win: Window) =>