diff --git a/src/@ionic-native/core/bootstrap.ts b/src/@ionic-native/core/bootstrap.ts index da49626cf..7d5dba721 100644 --- a/src/@ionic-native/core/bootstrap.ts +++ b/src/@ionic-native/core/bootstrap.ts @@ -1,5 +1,3 @@ -import * as _ from 'lodash'; - export function checkReady() { const DEVICE_READY_TIMEOUT = 5000; @@ -18,7 +16,7 @@ export function checkReady() { }); setTimeout(() => { - if (!didFireReady && !_.isUndefined(window.cordova)) { + if (!didFireReady && window.cordova) { console.warn( `Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.` ); diff --git a/src/@ionic-native/core/decorators/common.ts b/src/@ionic-native/core/decorators/common.ts index 11cefd296..d4a856615 100644 --- a/src/@ionic-native/core/decorators/common.ts +++ b/src/@ionic-native/core/decorators/common.ts @@ -1,4 +1,3 @@ -import { isUndefined } from 'lodash'; import { Observable, fromEvent } from 'rxjs'; import { CordovaOptions } from './interfaces'; @@ -375,12 +374,12 @@ export function pluginWarn( if (method) { console.warn( 'Native: tried calling ' + - pluginName + - '.' + - method + - ', but the ' + - pluginName + - ' plugin is not installed.' + pluginName + + '.' + + method + + ', but the ' + + pluginName + + ' plugin is not installed.' ); } else { console.warn( @@ -403,16 +402,16 @@ export function cordovaWarn(pluginName: string, method?: string): void { if (method) { console.warn( 'Native: tried calling ' + - pluginName + - '.' + - method + - ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator' + pluginName + + '.' + + method + + ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator' ); } else { console.warn( 'Native: tried accessing the ' + - pluginName + - ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator' + pluginName + + ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator' ); } } @@ -420,7 +419,7 @@ export function cordovaWarn(pluginName: string, method?: string): void { /** * @private */ -export const wrap = function ( +export const wrap = function( pluginObj: any, methodName: string, opts: CordovaOptions = {} @@ -525,7 +524,7 @@ export function wrapInstance( reject ); } - if (result && !isUndefined(result.then)) { + if (result && result.then) { result.then(resolve, reject); } else { reject(); diff --git a/src/@ionic-native/core/decorators/instance-property.ts b/src/@ionic-native/core/decorators/instance-property.ts index 865cc50e1..fb24852b7 100644 --- a/src/@ionic-native/core/decorators/instance-property.ts +++ b/src/@ionic-native/core/decorators/instance-property.ts @@ -1,14 +1,12 @@ -import * as _ from 'lodash'; - export function instancePropertyGet(pluginObj: any, key: string) { - if (!_.isUndefined(pluginObj._objectInstance) && !_.isUndefined(pluginObj._objectInstance[key])) { + if (pluginObj._objectInstance && pluginObj._objectInstance[key]) { return pluginObj._objectInstance[key]; } return null; } export function instancePropertySet(pluginObj: any, key: string, value: any) { - if (!_.isUndefined(pluginObj._objectInstance) && !_.isUndefined(pluginObj._objectInstance[key])) { + if (pluginObj._objectInstance && pluginObj._objectInstance[key]) { pluginObj._objectInstance[key] = value; } }