Merge pull request #749 from YuRiJinX/develop

feat(window): window close logic
chiflix · Jul 16, 2019 · 11dff42 · 11dff42
2 parents 37e986d + 9e7f631
commit 11dff42
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/main/index.js b/src/main/index.js
@@ -766,9 +766,9 @@ app.on('ready', () => {
 });
 
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
+  // if (process.platform !== 'darwin') {
+  // }
+  app.quit();
 });
 
 app.on('activate', () => {

diff --git a/src/renderer/containers/LandingView.vue b/src/renderer/containers/LandingView.vue
@@ -279,15 +279,15 @@ export default {
       }
     });
     window.addEventListener('keyup', this.keyboardHandler);
-    window.addEventListener('beforeunload', this.beforeUnloadHandler);
+    // window.addEventListener('beforeunload', this.beforeUnloadHandler);
     this.$electron.ipcRenderer.on('quit', () => {
       this.quit = true;
     });
   },
   destroyed() {
     window.removeEventListener('mousemove', this.globalMoveHandler);
     window.removeEventListener('keyup', this.keyboardHandler);
-    window.removeEventListener('beforeunload', this.beforeUnloadHandler);
+    // window.removeEventListener('beforeunload', this.beforeUnloadHandler);
   },
   methods: {
     globalMoveHandler() {

diff --git a/src/renderer/containers/VideoCanvas.vue b/src/renderer/containers/VideoCanvas.vue
@@ -368,15 +368,15 @@ export default {
           });
       } else if (process.env.NODE_ENV === 'development') { // app.hide() will disable app refresh and not good for dev
       } else if (process.platform === 'darwin' && !this.quit) {
-        e.returnValue = false;
-        this.$electron.remote.app.hide();
-        this.$electron.ipcRenderer.send('simulate-closing-window');
-        this.$bus.$off(); // remove all listeners before back to landing view
-        // need to init Vuex States
-        this.$router.push({
-          name: 'landing-view',
-        });
-        windowRectService.uploadWindowBy(false, 'landing-view');
+        // e.returnValue = false;
+        // this.$electron.remote.app.hide();
+        // this.$electron.ipcRenderer.send('simulate-closing-window');
+        // this.$bus.$off(); // remove all listeners before back to landing view
+        // // need to init Vuex States
+        // this.$router.push({
+        //   name: 'landing-view',
+        // });
+        // windowRectService.uploadWindowBy(false, 'landing-view');
       } else {
         this.$electron.remote.app.quit();
       }