projects / platform / framework / web / crosswalk-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9169208)
Only prevent unload the first time it is attempted
authorKevin Sawicki <kevinsawicki@gmail.com>
Wed, 3 Aug 2016 19:44:18 +0000 (12:44 -0700)
committerKevin Sawicki <kevinsawicki@gmail.com>
Wed, 3 Aug 2016 23:23:39 +0000 (16:23 -0700)
spec/fixtures/api/beforeunload-false.html patch | blob | history
spec/fixtures/api/close-beforeunload-empty-string.html patch | blob | history
spec/fixtures/api/close-beforeunload-false.html patch | blob | history

diff --git a/spec/fixtures/api/beforeunload-false.html b/spec/fixtures/api/beforeunload-false.html
index e34a194..4ba1867 100644 (file)
--- a/spec/fixtures/api/beforeunload-false.html
+++ b/spec/fixtures/api/beforeunload-false.html
@@ -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>
diff --git a/spec/fixtures/api/close-beforeunload-empty-string.html b/spec/fixtures/api/close-beforeunload-empty-string.html
index 2efaac3..13564fb 100644 (file)
--- a/spec/fixtures/api/close-beforeunload-empty-string.html
+++ b/spec/fixtures/api/close-beforeunload-empty-string.html
@@ -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>
diff --git a/spec/fixtures/api/close-beforeunload-false.html b/spec/fixtures/api/close-beforeunload-false.html
index 0359078..482b875 100644 (file)
--- a/spec/fixtures/api/close-beforeunload-false.html
+++ b/spec/fixtures/api/close-beforeunload-false.html
@@ -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>
Domain: Web Framework / Web Runtime;