paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-10-23 03:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

activetab: Fix broken last active tab. (#420)

Browse Source 
This fixes an issue where the server tabs were not loading
according to the last active tab. This used to load last server
no matter what the last used server is.

Fixes - #416.
This commit is contained in:
Akash Nimare
2018-02-18 17:52:26 +05:30
committed by GitHub
parent 55ae71c00c
commit 2d07d40c92
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/index.js
View File

@@ -221,11 +221,6 @@ app.on('ready', () => {
appMenu.setMenu(props);
});
ipcMain.on('register-server-tab-shortcut', (event, index) => {
// Array index == Shown index - 1
page.send('switch-server-tab', index - 1);
});
ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
setAutoLaunch(AutoLaunchValue);
});

3
app/renderer/js/components/server-tab.js
View File

@@ -50,7 +50,8 @@ class ServerTab extends Tab {
shortcutText = `Ctrl+${shownIndex}`;
}
ipcRenderer.send('register-server-tab-shortcut', shownIndex);
// Array index == Shown index - 1
ipcRenderer.send('switch-server-tab', shownIndex - 1);
return shortcutText;
}

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

@@ -419,7 +419,7 @@ class ServerManagerView {
});
ipcRenderer.on('switch-server-tab', (event, index) => {
this.activateTab(index);
this.activateLastTab(index);
});
ipcRenderer.on('reload-proxy', (event, showAlert) => {