paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-01 12:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code formatting done Fixes #124

Browse Source
This commit is contained in:
Lplenka
2017-03-18 13:20:15 +05:30
parent acf0282aa0
commit 5745276dbb
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/main/index.js
View File

@@ -3,19 +3,28 @@ const path = require('path');
const fs = require('fs');
const os = require('os');
const electron = require('electron');
const {app} = require('electron');
const {
app
} = require('electron');
const ipc = require('electron').ipcMain;
const {dialog} = require('electron');
const {
dialog
} = require('electron');
const https = require('https');
const http = require('http');
const electronLocalshortcut = require('electron-localshortcut');
const Configstore = require('configstore');
const JsonDB = require('node-json-db');
const isDev = require('electron-is-dev');
const tray = require('./tray');
const appMenu = require('./menu');
const {linkIsInternal, skipImages} = require('./link-helper');
const {appUpdater} = require('./autoupdater');
const https = require('https');
const http = require('http');
const {
linkIsInternal,
skipImages
} = require('./link-helper');
const {
appUpdater
} = require('./autoupdater');
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
const data = db.getData('/');
@@ -58,41 +67,31 @@ const targetURL = function () {
return data.domain;
};
function server_error(targetURL) {
function serverError(targetURL) {
if (targetURL.indexOf('localhost:') < 0 && data.domain) {
var req = https.request(targetURL + '/static/audio/zulip.ogg', (res) => {
const req = https.request(targetURL + '/static/audio/zulip.ogg', res => {
console.log('Server StatusCode:', res.statusCode);
console.log('You are connected to:', res.req._headers.host);
if (res.statusCode >= 500 && res.statusCode <= 599) {
return dialog.showErrorBox('SERVER IS DOWN!', 'We are getting a ' + res.statusCode + ' error status from the server ' + res.req._headers.host + '. Please try again after some time or you may switch server.')
return dialog.showErrorBox('SERVER IS DOWN!', 'We are getting a ' + res.statusCode + ' error status from the server ' + res.req._headers.host + '. Please try again after some time or you may switch server.');
}
});
req.on('error', (e) => {
req.on('error', e => {
console.error(e);
});
req.end();
} else if (data.domain) {
var req = http.request(targetURL + '/static/audio/zulip.ogg', (res) => {
const req = http.request(targetURL + '/static/audio/zulip.ogg', res => {
console.log('Server StatusCode:', res.statusCode);
console.log('You are connected to:', res.req._headers.host);
});
req.on('error', (e) => {
req.on('error', e => {
console.error(e);
});
req.end();
}
}
function checkConnectivity() {
return dialog.showMessageBox({
title: 'Internet connection problem',
@@ -192,12 +191,11 @@ function createMainWindow() {
win.show();
});
server_error(targetURL());
serverError(targetURL());
win.loadURL(targetURL(),
{
userAgent: isUserAgent + ' ' + win.webContents.getUserAgent()
});
win.loadURL(targetURL(), {
userAgent: isUserAgent + ' ' + win.webContents.getUserAgent()
});
win.on('closed', onClosed);
win.setTitle('Zulip');
@@ -326,7 +324,7 @@ ipc.on('new-domain', (e, domain) => {
mainWindow.show();
} else {
mainWindow.loadURL(domain);
server_error(domain);
serverError(domain);
}
targetLink = domain;
});

10
app/main/preload.js
View File

@@ -3,12 +3,12 @@ const ipcRenderer = require('electron').ipcRenderer;
const {webFrame} = require('electron');
const {spellChecker} = require('./spellchecker');
const _setImmediate = setImmediate
const _clearImmediate = clearImmediate
const _setImmediate = setImmediate;
const _clearImmediate = clearImmediate;
process.once('loaded', () => {
global.setImmediate = _setImmediate
global.clearImmediate = _clearImmediate
})
global.setImmediate = _setImmediate;
global.clearImmediate = _clearImmediate;
});
// enable swipe back/forward navigation on macOS
require('./macos-swipe-navigation.js').register();