Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Only prevent unload the first time it is attempted

Kevin Sawicki 8 years ago
parent
916920844e
commit
cce6be1900
3 changed files with 19 additions and 3 deletions
Split View Show Diff Stats
  1. 6 1
      spec/fixtures/api/beforeunload-false.html
  2. 7 1
      spec/fixtures/api/close-beforeunload-empty-string.html
  3. 6 1
      spec/fixtures/api/close-beforeunload-false.html

+ 6 - 1
spec/fixtures/api/beforeunload-false.html
View File 

@@ -1,11 +1,16 @@
 
 <html>
 
 <body>
 
 <script type="text/javascript" charset="utf-8">
 
+  // Only prevent unload on the first window close
 
+  var unloadPrevented = false;
 
   window.onbeforeunload = function() {
 
     setTimeout(function() {
 
       require('electron').remote.getCurrentWindow().emit('onbeforeunload');
 
     }, 0);
 
-    return false;
 
+    if (!unloadPrevented) {
 
+      unloadPrevented = true;
 
+      return false;
 
+    }
 
   }
 
 </script>
 
 </body>

+ 7 - 1
spec/fixtures/api/close-beforeunload-empty-string.html
View File 

@@ -1,11 +1,17 @@
 
 <html>
 
 <body>
 
 <script type="text/javascript" charset="utf-8">
 
+  // Only prevent unload on the first window close
 
+  var unloadPrevented = false;
 
   window.onbeforeunload = function() {
 
     setTimeout(function() {
 
       require('electron').remote.getCurrentWindow().emit('onbeforeunload');
 
     }, 0);
 
-    return '';
 
+
 
+    if (!unloadPrevented) {
 
+      unloadPrevented = true;
 
+      return '';
 
+    }
 
   }
 
   window.close();
 
 </script>

+ 6 - 1
spec/fixtures/api/close-beforeunload-false.html
View File 

@@ -1,11 +1,16 @@
 
 <html>
 
 <body>
 
 <script type="text/javascript" charset="utf-8">
 
+  // Only prevent unload on the first window close
 
+  var unloadPrevented = false;
 
   window.onbeforeunload = function() {
 
     setTimeout(function() {
 
       require('electron').remote.getCurrentWindow().emit('onbeforeunload');
 
     }, 0);
 
-    return false;
 
+    if (!unloadPrevented) {
 
+      unloadPrevented = true;
 
+      return false;
 
+    }
 
   }
 
   window.close();
 
 </script>