Rename window.env to window.config
Also normalize to camelCase for configs. // FREEBIE
This commit is contained in:
parent
75f4c3c522
commit
c83dbc1bf0
8 changed files with 12 additions and 12 deletions
|
@ -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
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"SERVER_URL": "https://textsecure-service-ca.whispersystems.org"
|
||||
"serverUrl": "https://textsecure-service-ca.whispersystems.org"
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
})();
|
||||
|
|
2
main.js
2
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
|
||||
}
|
||||
}))
|
||||
|
|
|
@ -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');
|
||||
|
|
Loading…
Add table
Reference in a new issue