fix merge conflicts

2016-08-27 14:55:37 -04:00 · 2016-08-27 14:55:37 -04:00 · 8d439ff0cf
commit 8d439ff0cf
parent f37a40e138 f2bf2b5626
1 changed files with 106 additions and 106 deletions
--- a/src/index.ts
+++ b/src/index.ts
@ -218,107 +218,107 @@ export * from './plugins/plugin';

 // Window export to use outside of a module loading system
 window['IonicNative'] = {
-  ActionSheet: ActionSheet,
-  AdMob: AdMob,
-  AndroidFingerprintAuth: AndroidFingerprintAuth,
-  AppAvailability: AppAvailability,
-  AppRate: AppRate,
-  AppVersion: AppVersion,
-  Badge: Badge,
-  BackgroundGeolocation: BackgroundGeolocation,
-  BackgroundMode: BackgroundMode,
-  BarcodeScanner: BarcodeScanner,
-  Base64ToGallery: Base64ToGallery,
-  BatteryStatus: BatteryStatus,
-  Brightness: Brightness,
-  BLE: BLE,
-  BluetoothSerial: BluetoothSerial,
-  Calendar: Calendar,
-  CallNumber: CallNumber,
-  CanvasCamera: CanvasCamera,
-  Camera: Camera,
-  CameraPreview: CameraPreview,
-  CardIO: CardIO,
-  Clipboard: Clipboard,
-  CodePush: CodePush,
-  Contacts: Contacts,
-  Crop: Crop,
-  DatePicker: DatePicker,
-  DBMeter: DBMeter,
-  Deeplinks: Deeplinks,
-  Device: Device,
-  DeviceAccounts: DeviceAccounts,
-  DeviceMotion: DeviceMotion,
-  DeviceOrientation: DeviceOrientation,
-  Dialogs: Dialogs,
-  Diagnostic: Diagnostic,
-  EmailComposer: EmailComposer,
-  EstimoteBeacons: EstimoteBeacons,
-  Facebook: Facebook,
-  File: File,
-  FileChooser: FileChooser,
-  FileOpener: FileOpener,
-  Flashlight: Flashlight,
-  Geofence: Geofence,
-  Geolocation: Geolocation,
-  Globalization: Globalization,
-  GooglePlus: GooglePlus,
-  GoogleMap: GoogleMap,
-  GoogleAnalytics: GoogleAnalytics,
-  Hotspot: Hotspot,
-  Httpd: Httpd,
-  IBeacon: IBeacon,
-  ImagePicker: ImagePicker,
-  ImageResizer: ImageResizer,
-  InAppBrowser: InAppBrowser,
-  InAppPurchase: InAppPurchase,
-  Instagram: Instagram,
-  IsDebug: IsDebug,
-  Keyboard: Keyboard,
-  LaunchNavigator: LaunchNavigator,
-  LocalNotifications: LocalNotifications,
-  Market: Market,
-  MediaCapture: MediaCapture,
-  MediaPlugin: MediaPlugin,
-  Mixpanel: Mixpanel,
-  MusicControls: MusicControls,
-  NativeAudio: NativeAudio,
-  NativePageTransitions: NativePageTransitions,
-  NativeStorage: NativeStorage,
-  Network: Network,
-  PayPal: PayPal,
-  NFC: NFC,
-  Printer: Printer,
-  Push: Push,
-  OneSignal: OneSignal,
-  PhotoViewer: PhotoViewer,
-  ScreenOrientation: ScreenOrientation,
-  PinDialog: PinDialog,
-  PowerManagement: PowerManagement,
-  SafariViewController: SafariViewController,
-  Screenshot: Screenshot,
-  SecureStorage: SecureStorage,
-  Shake: Shake,
-  Sim: Sim,
-  SMS: SMS,
-  SocialSharing: SocialSharing,
-  SpinnerDialog: SpinnerDialog,
-  Splashscreen: Splashscreen,
-  SQLite: SQLite,
-  StatusBar: StatusBar,
-  StreamingMedia: StreamingMedia,
-  ThreeDeeTouch: ThreeDeeTouch,
-  Toast: Toast,
-  TouchID: TouchID,
-  Transfer: Transfer,
-  TextToSpeech: TextToSpeech,
-  TwitterConnect: TwitterConnect,
-  VideoEditor: VideoEditor,
-  VideoPlayer: VideoPlayer,
-  Vibration: Vibration,
-  WebIntent: WebIntent,
-  YoutubeVideoPlayer: YoutubeVideoPlayer,
-  Zip: Zip
+  ActionSheet,
+  AdMob,
+  AndroidFingerprintAuth,
+  AppAvailability,
+  AppRate,
+  AppVersion,
+  Badge,
+  BackgroundGeolocation,
+  BackgroundMode,
+  BarcodeScanner,
+  Base64ToGallery,
+  BatteryStatus,
+  Brightness,
+  BLE,
+  BluetoothSerial,
+  Calendar,
+  CallNumber,
+  CanvasCamera,
+  Camera,
+  CameraPreview,
+  CardIO,
+  Clipboard,
+  CodePush,
+  Contacts,
+  Crop,
+  DatePicker,
+  DBMeter,
+  Deeplinks,
+  Device,
+  DeviceAccounts,
+  DeviceMotion,
+  DeviceOrientation,
+  Dialogs,
+  Diagnostic,
+  EmailComposer,
+  EstimoteBeacons,
+  Facebook,
+  File,
+  FileChooser,
+  FileOpener,
+  Flashlight,
+  Geofence,
+  Geolocation,
+  Globalization,
+  GooglePlus,
+  GoogleMap,
+  GoogleAnalytics,
+  Hotspot,
+  Httpd,
+  IBeacon,
+  ImagePicker,
+  ImageResizer,
+  InAppBrowser,
+  InAppPurchase,
+  Instagram,
+  IsDebug,
+  Keyboard,
+  LaunchNavigator,
+  LocalNotifications,
+  Market,
+  MediaCapture,
+  MediaPlugin,
+  Mixpanel,
+  MusicControls,
+  NativeAudio,
+  NativePageTransitions,
+  NativeStorage,
+  Network,
+  PayPal,
+  NFC,
+  Printer,
+  Push,
+  OneSignal,
+  PhotoViewer,
+  ScreenOrientation,
+  PinDialog,
+  PowerManagement,
+  SafariViewController,
+  Screenshot,
+  SecureStorage,
+  Shake,
+  Sim,
+  SMS,
+  SocialSharing,
+  SpinnerDialog,
+  Splashscreen,
+  SQLite,
+  StatusBar,
+  StreamingMedia,
+  ThreeDeeTouch,
+  Toast,
+  TouchID,
+  Transfer,
+  TextToSpeech,
+  TwitterConnect,
+  VideoEditor,
+  VideoPlayer,
+  Vibration,
+  WebIntent,
+  YoutubeVideoPlayer,
+  Zip
 };

 initAngular1(window['IonicNative']);
@ -327,16 +327,16 @@ initAngular1(window['IonicNative']);
 // log an error if it didn't fire in a reasonable amount of time. Generally,
 // when this happens, developers should remove and reinstall plugins, since
 // an inconsistent plugin is often the culprit.
-let before = +new Date;
+const before = Date.now();

 let didFireReady = false;
-document.addEventListener('deviceready', function() {
-  console.log('DEVICE READY FIRED AFTER', (+new Date - before), 'ms');
+document.addEventListener('deviceready', () => {
+  console.log('DEVICE READY FIRED AFTER', (Date.now() - before), 'ms');
  didFireReady = true;
 });

-setTimeout(function() {
+setTimeout(() => {
  if (!didFireReady && window.cordova) {
-    console.warn('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.');
+    console.warn(`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.`);
  }
 }, DEVICE_READY_TIMEOUT);