Skip to content

Commit

Permalink
feat(windows): change windowsphone platform to windows
Browse files Browse the repository at this point in the history
fixes snapshot too

references #5565
  • Loading branch information
brandyscarney committed Feb 25, 2016
1 parent c43a1a2 commit 8df8420
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ gulp.task('e2e.build', function() {
var platforms = [
'android',
'ios',
'wp'
'windows'
];

// Get each test folder with gulp.src
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/modal/test/basic/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class E2EPage {
console.log('tablet', platform.is('tablet'));
console.log('ios', platform.is('ios'));
console.log('android', platform.is('android'));
console.log('windows phone', platform.is('windowsphone'));
console.log('windows phone', platform.is('windows'));

platform.ready().then(() => {
console.log('platform.ready');
Expand Down
4 changes: 2 additions & 2 deletions ionic/config/test/config.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ export function run() {
expect(config.get('mode')).toEqual('ios');
});

it('should get md mode for windowsphone platform', () => {
it('should get md mode for windows platform', () => {
let config = new Config();
let platform = new Platform(['mobile', 'windowsphone']);
let platform = new Platform(['mobile', 'windows']);
config.setPlatform(platform);

expect(config.get('mode')).toEqual('md');
Expand Down
4 changes: 2 additions & 2 deletions ionic/platform/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Platform.register({


Platform.register({
name: 'windowsphone',
name: 'windows',
superset: 'mobile',
subsets: [
'phablet',
Expand All @@ -150,7 +150,7 @@ Platform.register({
hoverCSS: false
},
isMatch(p: Platform): boolean {
return p.isPlatform('windowsphone', 'windows phone');
return p.isPlatform('windows', 'windows');
},
versionParser(p: Platform): any {
return p.matchUserAgentVersion(/Windows Phone (\d+).(\d+)?/);
Expand Down

0 comments on commit 8df8420

Please sign in to comment.