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

fix(platform): fix testNavigatorPlatform regex

Browse Source
This commit is contained in:
Adam Bradley
2015-12-10 20:43:57 -06:00
parent d5597feac5
commit 1ff2231140
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/platform/platform.ts
View File

@ -301,10 +301,8 @@ export class Platform {
* @returns {boolean} TODO
*/
testNavigatorPlatform(navigatorPlatformExpression) {
if (navigatorPlatformExpression && this._bPlt) {
let rgx = new RegExp(navigatorPlatformExpression, 'i');
return rgx.test(this._bPlt);
}
let rgx = new RegExp(navigatorPlatformExpression, 'i');
return rgx.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/i)) {
if (p.testNavigatorPlatform('linux')) {
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/i);
return p.testNavigatorPlatform('iphone|ipad|ipod');
}