javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(platform): pass regexp to testNavigatorPlatform

Browse Source
This commit is contained in:
Max Lynch
2015-12-04 11:02:49 -06:00
parent 82e49331b1
commit 2c13de9c7b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ionic/platform/platform.ts
View File

@@ -301,8 +301,7 @@ export class Platform {
* @returns {boolean} TODO
*/
testNavigatorPlatform(navigatorPlatformExpression) {
let rgx = new RegExp(navigatorPlatformExpression, 'i');
return rgx.test(this._bPlt || '');
return navigatorPlatformExpression.test(this._bPlt || '');
}
/**

4
ionic/platform/registry.ts
View File

@@ -52,7 +52,7 @@ Platform.register({
// however, under-powered devices shouldn't use ripple
// if this a linux device, and is using Android Chrome v36 (Android 5.0)
// or above then use ripple, otherwise do not use a ripple effect
if (p.testNavigatorPlatform('linux')) {
if (p.testNavigatorPlatform('/linux/i')) {
let chromeVersion = p.matchUserAgentVersion(/Chrome\/(\d+).(\d+)?/);
if (chromeVersion) {
// linux android device using modern android chrome browser gets ripple
@@ -175,5 +175,5 @@ function isIOSDevice(p) {
// checks navigator.platform to see if it's an actual iOS device
// this does not use the user-agent string because it is often spoofed
// an actual iPad will return true, a chrome dev tools iPad will return false
return p.testNavigatorPlatform(/iphone|ipad|ipod/);
return p.testNavigatorPlatform(/iphone|ipad|ipod/i);
}