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

Do not show alert after turning off the proxy.

Browse Source
This commit is contained in:
Zhongyi Tong
2017-08-21 11:10:01 -04:00
parent 86674991c1
commit 5cd0c1ca4e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/renderer/js/main.js
View File

@@ -305,9 +305,11 @@ class ServerManagerView {
this.activateTab(index);
});
ipcRenderer.on('reload-proxy', () => {
ipcRenderer.on('reload-proxy', (event, showAlert) => {
this.loadProxy().then(() => {
alert('Proxy settings saved!');
if (showAlert) {
alert('Proxy settings saved!');
}
});
});

4
app/renderer/js/pages/preference/network-section.js
View File

@@ -63,7 +63,7 @@ class NetworkSection extends BaseSection {
ConfigUtil.setConfigItem('proxyRules', this.$proxyRules.value);
ConfigUtil.setConfigItem('proxyBypass', this.$proxyBypass.value);
ipcRenderer.send('forward-message', 'reload-proxy');
ipcRenderer.send('forward-message', 'reload-proxy', true);
});
}
@@ -91,7 +91,7 @@ class NetworkSection extends BaseSection {
this.toggleProxySettings(newValue);
if (newValue === false) {
// Reload proxy if the proxy is turned off
ipcRenderer.send('forward-message', 'reload-proxy');
ipcRenderer.send('forward-message', 'reload-proxy', false);
}
this.updateProxyOption();
}