From 985c02c5e1c122a0989a3abdaec42599efb534d9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 6 Dec 2017 20:19:06 -0500
Subject: [PATCH] rename bg variables

---
 src/background.ts                            | 8 +++-----
 src/models/domain/cipher.ts                  | 3 ++-
 src/models/domain/cipherString.ts            | 3 ++-
 src/popup/app/services/background.service.ts | 2 +-
 src/scripts/analytics.js                     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/background.ts b/src/background.ts
index 67dd6f24e7..0c7fc13d2f 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -1,11 +1,9 @@
 import MainBackground from './background/main.background';
 
-// tslint:disable-next-line:variable-name
-const bg_isBackground = (window as any).bg_isBackground = true;
-// tslint:disable-next-line:variable-name
-const bg_main = (window as any).bg_main = new MainBackground();
+const bitwardenIsBackground = (window as any).bitwardenIsBackground = true;
+const bitwardenMain = (window as any).bitwardenMain = new MainBackground();
 
 // tslint:disable-next-line:no-var-requires
 require('./scripts/analytics.js');
 
-bg_main.bootstrap();
+bitwardenMain.bootstrap();
diff --git a/src/models/domain/cipher.ts b/src/models/domain/cipher.ts
index 3149f78fd5..5d51c82828 100644
--- a/src/models/domain/cipher.ts
+++ b/src/models/domain/cipher.ts
@@ -120,7 +120,8 @@ class Cipher extends Domain {
                 model.subTitle = model.login.username;
                 if (model.login.uri) {
                     if (this.utilsService == null) {
-                        this.utilsService = chrome.extension.getBackgroundPage().bg_main.utilsService as UtilsService;
+                        this.utilsService = chrome.extension.getBackgroundPage()
+                            .bitwardenMain.utilsService as UtilsService;
                     }
 
                     model.login.domain = this.utilsService.getDomain(model.login.uri);
diff --git a/src/models/domain/cipherString.ts b/src/models/domain/cipherString.ts
index 41fbfc520c..61aec8ca6f 100644
--- a/src/models/domain/cipherString.ts
+++ b/src/models/domain/cipherString.ts
@@ -95,7 +95,8 @@ class CipherString {
 
         const self = this;
         if (this.cryptoService == null) {
-            this.cryptoService = chrome.extension.getBackgroundPage().bg_main.cryptoService as CryptoService;
+            this.cryptoService = chrome.extension.getBackgroundPage()
+                .bitwardenMain.cryptoService as CryptoService;
         }
 
         return this.cryptoService.getOrgKey(orgId).then((orgKey: any) => {
diff --git a/src/popup/app/services/background.service.ts b/src/popup/app/services/background.service.ts
index bf2387dfb8..4f95f140a9 100644
--- a/src/popup/app/services/background.service.ts
+++ b/src/popup/app/services/background.service.ts
@@ -4,7 +4,7 @@ import { UtilsService } from '../../../services/abstractions/utils.service';
 function getBackgroundService<T>(service: string) {
     return (): T => {
         const page = chrome.extension.getBackgroundPage();
-        return page ? page.bg_main[service] as T : null;
+        return page ? page.bitwardenMain[service] as T : null;
     };
 }
 
diff --git a/src/scripts/analytics.js b/src/scripts/analytics.js
index 559531c824..868ccea55f 100644
--- a/src/scripts/analytics.js
+++ b/src/scripts/analytics.js
@@ -4,7 +4,7 @@
         return;
     }
 
-    var bgMain = bgPage.bg_main;
+    var bgMain = bgPage.bitwardenMain;
     if (!bgMain) {
         return;
     }
@@ -79,7 +79,7 @@
             request.send(message);
         };
 
-        if (typeof bg_isBackground !== 'undefined') {
+        if (typeof bitwardenIsBackground !== 'undefined') {
             ga('send', 'pageview', '/background.html');
         }
     });