paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-10-24 16:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 🔧 linting error fixed

Browse Source
This commit is contained in:
Lplenka
2017-03-11 01:55:48 +05:30
parent d7d3017bc1
commit bfcaa51c46
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/index.js
View File

@@ -148,12 +148,12 @@ function createMainWindow() {
allowDisplayingInsecureContent: true, allowDisplayingInsecureContent: true,
nodeIntegration: false nodeIntegration: false
}, },
show:false show: false
}); });
win.once('ready-to-show', () => { win.once('ready-to-show', () => {
win.show(); win.show();
}) });
win.loadURL(targetURL(), win.loadURL(targetURL(),
{ {
userAgent: isUserAgent + ' ' + win.webContents.getUserAgent() userAgent: isUserAgent + ' ' + win.webContents.getUserAgent()

18
app/main/windowmanager.js
View File

@@ -34,22 +34,20 @@ function createdomainWindow() {
return domainwin; return domainwin;
} }
// Call this window onClick addDomain in tray // Call this window onClick addDomain in tray
function addDomain() { function addDomain() {
domainWindow = createdomainWindow(); domainWindow = createdomainWindow();
domainWindow.once('ready-to-show', () => { domainWindow.once('ready-to-show', () => {
domainWindow.show(); domainWindow.show();
}); });
setTimeout(() => {
if (domainWindow !== null) {
setTimeout(() => { if (!domainWindow.isDestroyed()) {
if (domainWindow!=null) {if (!domainWindow.isDestroyed()) domainWindow.destroy()} domainWindow.destroy();
}, 15000); }
}
}, 15000);
} }
// About window // About window
function createAboutWindow() { function createAboutWindow() {
const aboutwin = new electron.BrowserWindow({ const aboutwin = new electron.BrowserWindow({
@@ -81,7 +79,7 @@ function about() {
aboutWindow = createAboutWindow(); aboutWindow = createAboutWindow();
aboutWindow.once('ready-to-show', () => { aboutWindow.once('ready-to-show', () => {
aboutWindow.show(); aboutWindow.show();
}) });
} }
exports = module.exports = { exports = module.exports = {