mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Rename window.env to window.config

Browse source 
Also normalize to camelCase for configs.

// FREEBIE
This commit is contained in:
lilia 2017-04-13 10:47:30 -07:00 • committed by Scott Nonnenberg
parent 75f4c3c522
commit c83dbc1bf0
No known key found for this signature in database
GPG key ID: A4931C09644C654B
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/development.json
View file

@ -1,5 +1,5 @@
{ {
"SERVER_URL": "https://textsecure-service-staging.whispersystems.org", "serverUrl": "https://textsecure-service-staging.whispersystems.org",
"storageProfile": "development", "storageProfile": "development",
"disableAutoUpdate": true, "disableAutoUpdate": true,
"openDevTools": true "openDevTools": true

2
config/production.json
View file

@ -1,3 +1,3 @@
{ {
"SERVER_URL": "https://textsecure-service-ca.whispersystems.org" "serverUrl": "https://textsecure-service-ca.whispersystems.org"
} }

2
config/staging.json
View file

@ -1,5 +1,5 @@
{ {
"SERVER_URL": "https://textsecure-service-staging.whispersystems.org", "serverUrl": "https://textsecure-service-staging.whispersystems.org",
"storageProfile": "staging", "storageProfile": "staging",
"disableAutoUpdate": true, "disableAutoUpdate": true,
"openDevTools": true "openDevTools": true

4
js/background.js
View file

@ -9,7 +9,7 @@
}; };
console.log('background page reloaded'); console.log('background page reloaded');
console.log('NODE_ENV', window.env.NODE_ENV); console.log('NODE_ENV', window.config.NODE_ENV);
extension.notification.init(); extension.notification.init();
var initialLoadComplete = false; var initialLoadComplete = false;
@ -21,7 +21,7 @@
getAccountManager().refreshPreKeys(); getAccountManager().refreshPreKeys();
}); });
var SERVER_URL = env.SERVER_URL; var SERVER_URL = window.config.serverUrl;
var SERVER_PORTS = [80, 4433, 8443]; var SERVER_PORTS = [80, 4433, 8443];
var messageReceiver; var messageReceiver;
window.getSocketStatus = function() { window.getSocketStatus = function() {

2
js/debugLog.js
View file

@ -57,7 +57,7 @@
}; };
console.get = function() { console.get = function() {
return window.navigator.userAgent + return window.navigator.userAgent +
' Signal-Desktop/' + window.env.version + ' Signal-Desktop/' + window.config.version +
'\n' + log.print(); '\n' + log.print();
}; };
console.post = function(log) { console.post = function(log) {

4
js/i18n.js
View file

@ -3,7 +3,7 @@
*/ */
;(function() { ;(function() {
'use strict'; 'use strict';
var json = window.env.locale_json; var json = window.config.locale_json;
window.i18n = function (message, substitutions) { window.i18n = function (message, substitutions) {
if (!json[message]) { if (!json[message]) {
return; return;
@ -20,6 +20,6 @@
}; };
i18n.getLocale = function() { i18n.getLocale = function() {
return window.env.locale; return window.config.locale;
}; };
})(); })();

2
main.js
View file

@ -68,7 +68,7 @@ function createWindow () {
query: { query: {
locale: locale, locale: locale,
version: package_json.version, version: package_json.version,
SERVER_URL: config.get('SERVER_URL'), serverUrl: config.get('serverUrl'),
NODE_ENV: process.env.NODE_ENV NODE_ENV: process.env.NODE_ENV
} }
})) }))

6
preload.js
View file

@ -5,11 +5,11 @@
console.log('preload'); console.log('preload');
window.env = {}; window.config = {};
window.location.search.substring(1).split('&').forEach(function(variable) { window.location.search.substring(1).split('&').forEach(function(variable) {
var pair = variable.split('='); var pair = variable.split('=');
env[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]); config[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
}); });
const ipc = require('electron').ipcRenderer const ipc = require('electron').ipcRenderer
window.env.locale_json = ipc.sendSync('locale-data'); window.config.locale_json = ipc.sendSync('locale-data');