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

Merge pull request #267 from geeeeeeeeek/window-focus-fix

Browse Source 
Enhance error handling.
This commit is contained in:
Akash Nimare
2017-08-08 18:06:11 +00:00
committed by GitHub
parent 2424f7a995 84a69ce455
commit 56090151c2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/renderer/js/components/webview.js
View File

@@ -109,9 +109,10 @@ class WebView extends BaseComponent {
// Explicit focusing the webview causes a bug the input cannot regain focus on Winodws. // Explicit focusing the webview causes a bug the input cannot regain focus on Winodws.
// The bug is introduced from Electron and this is a tempory fix. // The bug is introduced from Electron and this is a tempory fix.
// See https://github.com/zulip/zulip-electron/issues/216 // See https://github.com/zulip/zulip-electron/issues/216
if (!this.$el.getWebContents().isFocused()) { const webContents = this.$el.getWebContents();
if (webContents && !webContents.isFocused()) {
this.$el.focus(); this.$el.focus();
this.$el.getWebContents().focus(); webContents.focus();
} }
} }