From c83dbc1bf0edb9db8c3a458b3a25e9162d5bc8cc Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 13 Apr 2017 10:47:30 -0700
Subject: [PATCH] Rename window.env to window.config

Also normalize to camelCase for configs.

// FREEBIE
---
 config/development.json | 2 +-
 config/production.json  | 2 +-
 config/staging.json     | 2 +-
 js/background.js        | 4 ++--
 js/debugLog.js          | 2 +-
 js/i18n.js              | 4 ++--
 main.js                 | 2 +-
 preload.js              | 6 +++---
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/development.json b/config/development.json
index b8d0cf811..4024e4f0d 100644
--- a/config/development.json
+++ b/config/development.json
@@ -1,5 +1,5 @@
 {
-  "SERVER_URL": "https://textsecure-service-staging.whispersystems.org",
+  "serverUrl": "https://textsecure-service-staging.whispersystems.org",
   "storageProfile": "development",
   "disableAutoUpdate": true,
   "openDevTools": true
diff --git a/config/production.json b/config/production.json
index 1962be6dc..b52ba72b5 100644
--- a/config/production.json
+++ b/config/production.json
@@ -1,3 +1,3 @@
 {
-  "SERVER_URL": "https://textsecure-service-ca.whispersystems.org"
+  "serverUrl": "https://textsecure-service-ca.whispersystems.org"
 }
diff --git a/config/staging.json b/config/staging.json
index 5584aa65a..a4f990b35 100644
--- a/config/staging.json
+++ b/config/staging.json
@@ -1,5 +1,5 @@
 {
-  "SERVER_URL": "https://textsecure-service-staging.whispersystems.org",
+  "serverUrl": "https://textsecure-service-staging.whispersystems.org",
   "storageProfile": "staging",
   "disableAutoUpdate": true,
   "openDevTools": true
diff --git a/js/background.js b/js/background.js
index 64b4fda85..bd8f10903 100644
--- a/js/background.js
+++ b/js/background.js
@@ -9,7 +9,7 @@
     };
 
     console.log('background page reloaded');
-    console.log('NODE_ENV', window.env.NODE_ENV);
+    console.log('NODE_ENV', window.config.NODE_ENV);
     extension.notification.init();
 
     var initialLoadComplete = false;
@@ -21,7 +21,7 @@
         getAccountManager().refreshPreKeys();
     });
 
-    var SERVER_URL = env.SERVER_URL;
+    var SERVER_URL = window.config.serverUrl;
     var SERVER_PORTS = [80, 4433, 8443];
     var messageReceiver;
     window.getSocketStatus = function() {
diff --git a/js/debugLog.js b/js/debugLog.js
index d1409e779..1100e3f19 100644
--- a/js/debugLog.js
+++ b/js/debugLog.js
@@ -57,7 +57,7 @@
         };
         console.get = function() {
             return window.navigator.userAgent +
-                ' Signal-Desktop/' + window.env.version +
+                ' Signal-Desktop/' + window.config.version +
                 '\n' + log.print();
         };
         console.post = function(log) {
diff --git a/js/i18n.js b/js/i18n.js
index e3054f7a5..d47ffad03 100644
--- a/js/i18n.js
+++ b/js/i18n.js
@@ -3,7 +3,7 @@
  */
 ;(function() {
     'use strict';
-    var json = window.env.locale_json;
+    var json = window.config.locale_json;
     window.i18n = function (message, substitutions) {
       if (!json[message]) {
         return;
@@ -20,6 +20,6 @@
     };
 
     i18n.getLocale = function() {
-      return window.env.locale;
+      return window.config.locale;
     };
 })();
diff --git a/main.js b/main.js
index a90f8e6ca..1017e2371 100644
--- a/main.js
+++ b/main.js
@@ -68,7 +68,7 @@ function createWindow () {
     query: {
       locale: locale,
       version: package_json.version,
-      SERVER_URL: config.get('SERVER_URL'),
+      serverUrl: config.get('serverUrl'),
       NODE_ENV: process.env.NODE_ENV
     }
   }))
diff --git a/preload.js b/preload.js
index efa4d4294..840b9c5e0 100644
--- a/preload.js
+++ b/preload.js
@@ -5,11 +5,11 @@
 
 console.log('preload');
 
-window.env = {};
+window.config = {};
 window.location.search.substring(1).split('&').forEach(function(variable) {
   var pair = variable.split('=');
-  env[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
+  config[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
 });
 
 const ipc = require('electron').ipcRenderer
-window.env.locale_json = ipc.sendSync('locale-data');
+window.config.locale_json = ipc.sendSync('locale-data');