paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-03 21:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle reload event correctly

Browse Source 
Added the functionality to remember the last active tab. Previously, we used to load the first tab no matter what.
Also, when user adds a new server the same server will be activated.
Reloading the app will now reload the current view/server only.

Fixes #311, #308
This commit is contained in:
akashnimare
2017-10-05 05:11:26 +05:30
parent 45bdde951f
commit f409bb0449
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,12 +76,13 @@ class ServerManagerView {
this.initServer(servers[i], i);
DomainUtil.updateSavedServer(servers[i].url, i);
this.activateTab(i);
// console.log(this.activateTab)
}
this.activateTab(0);
// Open last active tab
this.activateTab(ConfigUtil.getConfigItem('lastActiveTab'));
} else {
this.openSettings('Servers');
}
ipcRenderer.send('local-shortcuts', true);
}
@@ -90,7 +91,7 @@ class ServerManagerView {
role: 'server',
icon: server.icon,
$root: this.$tabsContainer,
onClick: this.activateTab.bind(this, index),
onClick: this.activateLastTab.bind(this, index),
index,
onHover: this.onHover.bind(this, index, server.alias),
onHoverOut: this.onHoverOut.bind(this, index),
@@ -201,6 +202,13 @@ class ServerManagerView {
});
}
activateLastTab(index) {
// Open last active tab
ConfigUtil.setConfigItem('lastActiveTab', index);
// Open all the tabs in background
this.activateTab(index);
}
activateTab(index, hideOldTab = true) {
if (this.tabs[index].webview.loading) {
return;
@@ -254,6 +262,11 @@ class ServerManagerView {
}
reloadView() {
// Save and remember the index of last active tab so that we can use it later
const lastActiveTab = this.tabs[this.activeTabIndex].props.index;
ConfigUtil.setConfigItem('lastActiveTab', lastActiveTab);
// Destroy the current view and re-initiate it
this.destroyView();
this.initTabs();
}
@@ -308,7 +321,7 @@ class ServerManagerView {
ipcRenderer.on('open-about', this.openAbout.bind(this));
ipcRenderer.on('reload-viewer', this.reloadView.bind(this));
ipcRenderer.on('reload-viewer', this.reloadView.bind(this, this.tabs[this.activeTabIndex].props.index));
ipcRenderer.on('hard-reload', () => {
ipcRenderer.send('reload-full-app');