diff --git a/js/utils/platform.js b/js/utils/platform.js index 9c7694124ed..2ebf2781f8e 100644 --- a/js/utils/platform.js +++ b/js/utils/platform.js @@ -116,6 +116,8 @@ if(this.isAndroid() && version < 4.4) { this.grade = (version < 4 ? 'c' : 'b'); + } else if(this.isWindowsPhone()) { + this.grade = 'b'; } } } diff --git a/scss/_platform.scss b/scss/_platform.scss index edd3c46ba27..d9db29a325d 100644 --- a/scss/_platform.scss +++ b/scss/_platform.scss @@ -52,8 +52,8 @@ } } -.platform-android2:not(.enable-transitions) * { - // disable transitions on Android 2 +.platform-c:not(.enable-transitions) * { + // disable transitions on grade-c devices (Android 2) -webkit-transition: none !important; transition: none !important; } diff --git a/test/unit/angular/service/platform.unit.js b/test/unit/angular/service/platform.unit.js index 98af3b0c197..f35499fa082 100644 --- a/test/unit/angular/service/platform.unit.js +++ b/test/unit/angular/service/platform.unit.js @@ -276,6 +276,14 @@ describe('Ionic Platform Service', function() { expect(ionic.Platform.grade).toEqual('a'); }); + it('sets grade b from Windows Phone platform', function() { + window.cordova = {}; + ionic.Platform.setPlatform('windowsphone'); + ionic.Platform.setVersion('8.0'); + ionic.Platform._checkPlatforms(); + expect(ionic.Platform.grade).toEqual('b'); + }); + it('sets grade a from unknown platform', function() { window.cordova = {}; ionic.Platform.setPlatform('whatever');