Skip to content

Platform is fix #10292

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 2 commits into from
Feb 2, 2017
Merged

Platform is fix #10292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0086170
fix(platform): iPad pro is detected as an iPad
jgw96 Feb 2, 2017
c58948b
chore(platform): ipad should be last
jgw96 Feb 2, 2017
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
10 changes: 10 additions & 0 deletions src/platform/platform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,16 @@ export class Platform {
while (platformNode) {
platformNode.initialize(this);

// extra check for ipad pro issue
// https://forums.developer.apple.com/thread/25948
if (platformNode.name === 'iphone' && this.navigatorPlatform() === 'iPad') {
// this is an ipad pro so push ipad and tablet to platforms
// and then return as we are done
this._platforms.push('tablet');
this._platforms.push('ipad');
return;
}

// set the array of active platforms with
// the last one in the array the most important
this._platforms.push(platformNode.name);
Expand Down
31 changes: 31 additions & 0 deletions src/platform/test/platform.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,37 @@ describe('Platform', () => {
expect(plt.is('tablet')).toEqual(true);
});

// for https://forums.developer.apple.com/thread/25948
it('should set ipad when user agent is iphone but navigator.platform is iPad', () => {
plt.setQueryParams('');
plt.setUserAgent(IPHONE_UA);
plt.setNavigatorPlatform('iPad');
plt.init();

expect(plt.is('core')).toEqual(false);
expect(plt.is('mobile')).toEqual(true);
expect(plt.is('windows')).toEqual(false);
expect(plt.is('android')).toEqual(false);
expect(plt.is('ios')).toEqual(true);
expect(plt.is('ipad')).toEqual(true);
expect(plt.is('iphone')).toEqual(false);
expect(plt.is('tablet')).toEqual(true);

plt.setQueryParams('');
plt.setUserAgent(IPHONE_10_2_UA);
plt.setNavigatorPlatform('iPad');
plt.init();

expect(plt.is('core')).toEqual(false);
expect(plt.is('mobile')).toEqual(true);
expect(plt.is('windows')).toEqual(false);
expect(plt.is('android')).toEqual(false);
expect(plt.is('ios')).toEqual(true);
expect(plt.is('ipad')).toEqual(true);
expect(plt.is('iphone')).toEqual(false);
expect(plt.is('tablet')).toEqual(true);
});

it('should set core platform for osx desktop firefox', () => {
plt.setQueryParams('');
plt.setDefault('core');
Expand Down