Merge remote-tracking branch 'origin/master' into WIP-api-demos

ionic/platform/platform.ts

@@ -302,10 +302,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);
   }
 
   /**

ionic/platform/registry.ts

@@ -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');
 }

ionic/platform/storage/sql.ts

@@ -1,6 +1,6 @@
 import {StorageEngine} from './storage';
 
-import * as util from 'ionic/util';
+import * as util from '../../util';
 
 const DB_NAME = '__ionicstorage';