fix: issue form with multiple accounts

web-pal · Mar 14, 2018 · 290ef83 · 290ef83
1 parent aa7da03
commit 290ef83
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 49 deletions.
diff --git a/app/config/config.development.js b/app/config/config.development.js
@@ -9,6 +9,7 @@ const config = {
   checkUpdates: false,
   infoLog: false,
   reduxLogger: true,
+  issueWindowDevTools: false,
 };
 
 export default config;
diff --git a/app/config/config.production.js b/app/config/config.production.js
@@ -9,6 +9,7 @@ const config = {
   idleTimeThreshold: 300,
   checkUpdates: true,
   infoLog: false,
+  issueWindowDevTools: false,
 };
 
 export default config;
diff --git a/app/containers/Popups/IssueForm/IssueForm.jsx b/app/containers/Popups/IssueForm/IssueForm.jsx
@@ -8,6 +8,7 @@ import {
   AppWrapper,
   FullPageSpinner,
 } from 'styles';
+import config from '../../../config';
 
 
 class IssueForm extends Component<{}, any> {
@@ -37,18 +38,26 @@ class IssueForm extends Component<{}, any> {
   }
 
   onLoadUrl = (ev, url) => {
-    const webview = document.createElement('webview');
-    webview.setAttribute('preload', './preload.js');
-    webview.style.height = '100%';
+    let webview = document.querySelector('webview');
+    if (!webview) {
+      webview = document.createElement('webview');
+      webview.setAttribute('preload', './preload.js');
+      webview.style.height = '100%';
 
-    webview.addEventListener('did-finish-load', () => {
-      if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === true) {
-        webview.openDevTools();
-      }
-    });
+      webview.addEventListener('did-finish-load', () => {
+        if (
+          config.issueWindowDevTools ||
+          process.env.DEBUG_PROD === true
+        ) {
+          webview.openDevTools();
+        }
+      });
 
-    webview.src = url;
-    document.getElementById('forWebview').appendChild(webview);
+      webview.src = url;
+      document.getElementById('forWebview').appendChild(webview);
+    } else {
+      webview.src = url;
+    }
   }
 
   onShowForm = (

diff --git a/app/main.dev.js b/app/main.dev.js
@@ -14,10 +14,12 @@ import {
 } from 'electron';
 import notifier from 'node-notifier';
 import MenuBuilder from './menu';
+import config from './config';
 
 const appDir = app.getPath('userData');
 
 let mainWindow;
+let issueWindow;
 let tray;
 let menu;
 let authWindow;
@@ -219,6 +221,9 @@ function createWindow(callback) {
           }
         } else if (process.platform === 'darwin') {
           checkRunning(e);
+          if (shouldQuit) {
+            issueWindow.destroy();
+          }
         }
       }
     });
@@ -393,45 +398,52 @@ ipcMain.on('issue-refetch', (event, issueId) => {
 });
 
 ipcMain.on('load-issue-window', (event, url) => {
-  const createIssueWindow = new BrowserWindow({
-    backgroundColor: 'white',
-    parent: mainWindow,
-    show: false,
-    modal: true,
-    useContentSize: true,
-    center: true,
-    title: 'Chronos',
-    webPreferences: {
-      devTools: true,
-    },
-  });
-  createIssueWindow.loadURL(`file://${__dirname}/issueForm.html`);
-  createIssueWindow.webContents.on('did-finish-load', () => {
-    createIssueWindow.webContents.send('url', url);
-  });
-  if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === true) {
-    createIssueWindow.openDevTools();
-  }
-  createIssueWindow.on('close', (cEv) => {
-    cEv.preventDefault();
-    createIssueWindow.hide();
-  });
-  ipcMain.on('page-fully-loaded', () => {
-    if (createIssueWindow) {
-      createIssueWindow.webContents.send('page-fully-loaded');
-    }
-  });
-  ipcMain.on('close-issue-window', () => {
-    if (createIssueWindow) {
-      createIssueWindow.hide();
-    }
-  });
-  ipcMain.on('show-issue-window', (ev, opts) => {
-    if (createIssueWindow) {
-      createIssueWindow.webContents.send('showForm', opts);
-      createIssueWindow.show();
+  if (!issueWindow) {
+    issueWindow = new BrowserWindow({
+      backgroundColor: 'white',
+      parent: mainWindow,
+      show: false,
+      modal: true,
+      useContentSize: true,
+      center: true,
+      title: 'Chronos',
+      webPreferences: {
+        devTools: true,
+      },
+    });
+    issueWindow.loadURL(`file://${__dirname}/issueForm.html`);
+    issueWindow.webContents.on('did-finish-load', () => {
+      issueWindow.webContents.send('url', url);
+    });
+    if (
+      config.issueWindowDevTools ||
+      process.env.DEBUG_PROD === true
+    ) {
+      issueWindow.openDevTools();
     }
-  });
+    issueWindow.on('close', (cEv) => {
+      cEv.preventDefault();
+      issueWindow.hide();
+    });
+    ipcMain.on('page-fully-loaded', () => {
+      if (issueWindow) {
+        issueWindow.webContents.send('page-fully-loaded');
+      }
+    });
+    ipcMain.on('close-issue-window', () => {
+      if (issueWindow) {
+        issueWindow.hide();
+      }
+    });
+    ipcMain.on('show-issue-window', (ev, opts) => {
+      if (issueWindow) {
+        issueWindow.webContents.send('showForm', opts);
+        issueWindow.show();
+      }
+    });
+  } else {
+    issueWindow.webContents.send('url', url);
+  }
 });
 
 ipcMain.on('oauth-response', (event, text) => {

diff --git a/app/menu.js b/app/menu.js
@@ -62,7 +62,7 @@ export default class MenuBuilder {
           label: 'Quit',
           accelerator: 'Command+Q',
           click: (menu, win) => {
-            if (win.id !== 1) {
+            if (win && win.id !== 1) {
               win.hide();
             } else {
               app.quit();