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

refactor(platform): isPlatform() does not need window (#19022)

Browse Source
This commit is contained in:
Manu MA
2019-08-08 17:24:54 +02:00
committed by GitHub
parent e4357f9823
commit 7c48500f27
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,25 @@
export type Platforms = keyof typeof PLATFORMS_MAP; export type Platforms = keyof typeof PLATFORMS_MAP;
export const getPlatforms = (win: any) => setupPlatforms(win); interface IsPlatformSignature {
(plt: Platforms): boolean;
(win: Window, plt: Platforms): boolean;
}
export const isPlatform = (win: Window, platform: Platforms) => export const getPlatforms = (win?: any) => setupPlatforms(win);
getPlatforms(win).indexOf(platform) > -1;
export const setupPlatforms = (win: any) => { export const isPlatform: IsPlatformSignature = (winOrPlatform: Window | Platforms | undefined, platform?: Platforms) => {
if (typeof winOrPlatform === 'string') {
platform = winOrPlatform;
winOrPlatform = undefined;
}
return getPlatforms(winOrPlatform).includes(platform!);
};
export const setupPlatforms = (win: any = window) => {
win.Ionic = win.Ionic || {}; win.Ionic = win.Ionic || {};
let platforms: string[] | undefined | null = win.Ionic.platforms; let platforms: Platforms[] | undefined | null = win.Ionic.platforms;
if (platforms == null) { if (platforms == null) {
platforms = win.Ionic.platforms = detectPlatforms(win); platforms = win.Ionic.platforms = detectPlatforms(win);
platforms.forEach(p => win.document.documentElement.classList.add(`plt-${p}`)); platforms.forEach(p => win.document.documentElement.classList.add(`plt-${p}`));
@ -17,12 +27,12 @@ export const setupPlatforms = (win: any) => {
return platforms; return platforms;
}; };
const detectPlatforms = (win: Window) =>
(Object.keys(PLATFORMS_MAP) as Platforms[]).filter(p => PLATFORMS_MAP[p](win));
const isMobileWeb = (win: Window): boolean => const isMobileWeb = (win: Window): boolean =>
isMobile(win) && !isHybrid(win); isMobile(win) && !isHybrid(win);
const detectPlatforms = (win: Window): string[] =>
Object.keys(PLATFORMS_MAP).filter(p => (PLATFORMS_MAP as any)[p](win));
const isIpad = (win: Window) => const isIpad = (win: Window) =>
testUserAgent(win, /iPad/i); testUserAgent(win, /iPad/i);

6
core/src/utils/test/platform.spec.ts
View File

@ -51,6 +51,12 @@ describe('Platform Tests', () => {
expect(isPlatform(win, 'hybrid')).toEqual(true); expect(isPlatform(win, 'hybrid')).toEqual(true);
}); });
it('should work without win parameter', () => {
(global as any).window = configureBrowser(PlatformConfiguration.DesktopSafari);
expect(isPlatform('capacitor')).toEqual(false);
expect(isPlatform('desktop')).toEqual(true);
});
it('should return false for "capacitor" and true for "desktop" on desktop safari', () => { it('should return false for "capacitor" and true for "desktop" on desktop safari', () => {
const win = configureBrowser(PlatformConfiguration.DesktopSafari); const win = configureBrowser(PlatformConfiguration.DesktopSafari);
expect(isPlatform(win, 'capacitor')).toEqual(false); expect(isPlatform(win, 'capacitor')).toEqual(false);