paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-19 05:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

context-menu: Fix context menu indexing.

Browse Source 
Addresses a problem where the context menu would get the incorrect index
of server in sidebar and cause a crash when attempting to remove the
server.

Add comment justifying extra index parameter.
This commit is contained in:
Kanishk Kakar
2019-01-30 12:22:36 +05:30
committed by Akash Nimare
parent 9bdc5dd9e4
commit 9e33ebae62
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,10 +209,10 @@ class ServerManagerView {
$serverImgs.forEach(($serverImg, index) => { $serverImgs.forEach(($serverImg, index) => {
this.addContextMenu($serverImg, index); this.addContextMenu($serverImg, index);
if ($serverImg.src.includes('img/icon.png')) { if ($serverImg.src.includes('img/icon.png')) {
this.displayInitialCharLogo($serverImg); this.displayInitialCharLogo($serverImg, index);
} }
$serverImg.addEventListener('error', () => { $serverImg.addEventListener('error', () => {
this.displayInitialCharLogo($serverImg); this.displayInitialCharLogo($serverImg, index);
}); });
}); });
} }
@@ -253,7 +253,12 @@ class ServerManagerView {
return currentIndex; return currentIndex;
} }
displayInitialCharLogo($img) { displayInitialCharLogo($img, index) {
/*
index parameter needed because webview[data-tab-id] can increment
beyond size of sidebar org array and throw error
*/
const $altIcon = document.createElement('div'); const $altIcon = document.createElement('div');
const $parent = $img.parentElement; const $parent = $img.parentElement;
const $container = $parent.parentElement; const $container = $parent.parentElement;
@@ -273,7 +278,7 @@ class ServerManagerView {
$parent.removeChild($img); $parent.removeChild($img);
$parent.appendChild($altIcon); $parent.appendChild($altIcon);
this.addContextMenu($altIcon, $webview.getAttribute('data-tab-id')); this.addContextMenu($altIcon, index);
} }
sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) { sidebarHoverEvent(SidebarButton, SidebarTooltip, addServer = false) {