paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-02 04:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue fix in better way

Browse Source
This commit is contained in:
Lplenka
2017-03-04 10:02:27 +05:30
parent db2860b53e
commit 394caa7934
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/main/domain.js
View File

@@ -19,22 +19,18 @@ window.addDomain = function () {
document.getElementById('main').innerHTML = 'Checking...';
if (newDomain.indexOf('localhost:') >= 0) {
const domain = 'http://' + newDomain;
request(domain, (error, response, body) => {
console.log(response);
if (!error && response.statusCode === 200) {
if (response.headers.server === 'WSGIServer/0.1 Python/2.7.6' && (body.indexOf('Zulip Dev') || body.indexOf('zulip.com'))) {
document.getElementById('main').innerHTML = 'Connect';
db.push('/domain', domain);
ipcRenderer.send('new-domain', domain);
} else {
document.getElementById('main').innerHTML = 'Connect';
document.getElementById('server-status').innerHTML = 'Not a valid Zulip Local Server.';
}
const checkDomain = domain + '/static/audio/zulip.ogg';
request(checkDomain, (error, response) => {
if (!error && response.statusCode !== 404) {
document.getElementById('main').innerHTML = 'Connect';
db.push('/domain', domain);
ipcRenderer.send('new-domain', domain);
} else {
document.getElementById('main').innerHTML = 'Connect';
document.getElementById('server-status').innerHTML = 'Not a valid Zulip Local Server.';
}
});
// });
} else {
const domain = 'https://' + newDomain;
const checkDomain = domain + '/static/audio/zulip.ogg';

19
app/renderer/js/pref.js
View File

@@ -38,17 +38,13 @@ window.prefDomain = function () {
document.getElementById('main').innerHTML = 'Checking...';
if (newDomain.indexOf('localhost:') >= 0) {
const domain = 'http://' + newDomain;
request(domain, (error, response, body) => {
if (!error && response.statusCode === 200) {
if (response.headers.server === 'WSGIServer/0.1 Python/2.7.6' && (body.indexOf('Zulip Dev') || body.indexOf('zulip.com'))) {
document.getElementById('main').innerHTML = 'Switch';
document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
db.push('/domain', domain);
ipcRenderer.send('new-domain', domain);
} else {
document.getElementById('main').innerHTML = 'Switch';
document.getElementById('urladded').innerHTML = 'Not a valid Zulip Local Server.';
}
const checkDomain = domain + '/static/audio/zulip.ogg';
request(checkDomain, (error, response) => {
if (!error && response.statusCode !== 404) {
document.getElementById('main').innerHTML = 'Switch';
document.getElementById('urladded').innerHTML = 'Switched to ' + newDomain;
db.push('/domain', domain);
ipcRenderer.send('new-domain', domain);
} else {
document.getElementById('main').innerHTML = 'Switch';
document.getElementById('urladded').innerHTML = 'Not a valid Zulip Local Server.';
@@ -57,7 +53,6 @@ window.prefDomain = function () {
} else {
const domain = 'https://' + newDomain;
const checkDomain = domain + '/static/audio/zulip.ogg';
request(checkDomain, (error, response) => {
if (!error && response.statusCode !== 404) {
document.getElementById('main').innerHTML = 'Switch';