go back to using isBrowser

jweismann · Jun 21, 2017 · db01c34 · db01c34
1 parent 7358bee
commit db01c34
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/lib/drivers/medtronic/medtronicDriver.js b/lib/drivers/medtronic/medtronicDriver.js
@@ -27,8 +27,8 @@ var common = require('../../commonFunctions');
 var medtronicSimulator = require('./medtronicSimulator');
 var crcCalculator = require('../../crc.js');
 
-var isElectron = require('is-electron');
-var debug = isElectron() ? require('bows')('MedtronicDriver') : console.log;
+var isBrowser = typeof window !== 'undefined';
+var debug = isBrowser ? require('bows')('MedtronicDriver') : console.log;
 
 module.exports = function (config) {
   var cfg = _.clone(config);

diff --git a/lib/drivers/medtronic/medtronicSimulator.js b/lib/drivers/medtronic/medtronicSimulator.js
@@ -24,8 +24,8 @@ var util = require('util');
 var annotate = require('../../eventAnnotations');
 var common = require('../../commonFunctions');
 
-var isElectron = require('is-electron');
-var debug = isElectron() ? require('bows')('MedtronicDriver') : console.log;
+var isBrowser = typeof window !== 'undefined';
+var debug = isBrowser ? require('bows')('MedtronicDriver') : console.log;
 var __DEBUG__ = __DEBUG__ || true;
 
 /**

diff --git a/lib/drivers/medtronic/processData.js b/lib/drivers/medtronic/processData.js
@@ -25,8 +25,8 @@ var common = require('../../commonFunctions');
 var annotate = require('../../eventAnnotations');
 var TZOUtil = require('../../TimezoneOffsetUtil');
 
-var isElectron = require('is-electron');
-var debug = isElectron() ? require('bows')('MedtronicDriver') : console.log;
+var isBrowser = typeof window !== 'undefined';
+var debug = isBrowser ? require('bows')('MedtronicDriver') : console.log;
 var __DEBUG__ = __DEBUG__ || true;
 
 var RECORD_TYPES = {

diff --git a/manifest.json b/manifest.json
@@ -2,11 +2,7 @@
   "manifest_version": 2,
   "name": "Tidepool Uploader",
   "short_name": "Uploader",
-<<<<<<< HEAD
-  "version": "0.305.32",
-=======
   "version": "0.306.1",
->>>>>>> master
   "description": "The Tidepool Uploader helps you get your data from insulin pumps, CGMs and BG meters into Tidepool’s secure cloud platform.",
   "minimum_chrome_version": "38",
   "icons": {