mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Only prevent unload the first time it is attempted

Browse source
This commit is contained in:
Kevin Sawicki 2016-08-03 12:44:18 -07:00
parent 916920844e
commit cce6be1900
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
spec/fixtures/api/beforeunload-false.html vendored
View file

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

8
spec/fixtures/api/close-beforeunload-empty-string.html vendored
View file

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

7
spec/fixtures/api/close-beforeunload-false.html vendored
View file

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