javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(windows): change windowsphone platform to windows

Browse Source 
fixes snapshot too

references #5565
This commit is contained in:
Brandy Carney
2016-02-25 12:17:28 -05:00
parent c43a1a2d77
commit 8df8420f14
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -397,7 +397,7 @@ gulp.task('e2e.build', function() {
var platforms = [ var platforms = [
'android', 'android',
'ios', 'ios',
'wp' 'windows'
]; ];
// Get each test folder with gulp.src // Get each test folder with gulp.src

2
ionic/components/modal/test/basic/index.ts
View File

@ -23,7 +23,7 @@ class E2EPage {
console.log('tablet', platform.is('tablet')); console.log('tablet', platform.is('tablet'));
console.log('ios', platform.is('ios')); console.log('ios', platform.is('ios'));
console.log('android', platform.is('android')); console.log('android', platform.is('android'));
console.log('windows phone', platform.is('windowsphone')); console.log('windows phone', platform.is('windows'));
platform.ready().then(() => { platform.ready().then(() => {
console.log('platform.ready'); console.log('platform.ready');

4
ionic/config/test/config.spec.ts
View File

@ -213,9 +213,9 @@ export function run() {
expect(config.get('mode')).toEqual('ios'); 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 config = new Config();
let platform = new Platform(['mobile', 'windowsphone']); let platform = new Platform(['mobile', 'windows']);
config.setPlatform(platform); config.setPlatform(platform);
expect(config.get('mode')).toEqual('md'); expect(config.get('mode')).toEqual('md');

4
ionic/platform/registry.ts
View File

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