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

Fix #8911

22222 8 years ago
parent
96ca623846
commit
042b511a27
4 changed files with 81 additions and 0 deletions
Split View Show Diff Stats
  1. 9 0
      atom/browser/api/atom_api_web_contents.cc
  2. 1 0
      atom/browser/api/atom_api_web_contents.h
  3. 54 0
      spec/api-browser-window-spec.js
  4. 17 0
      spec/fixtures/api/beforeunload-false-prevent3.html

+ 9 - 0
atom/browser/api/atom_api_web_contents.cc
View File 

@@ -872,6 +872,15 @@ void WebContents::Observe(int type,
 
   }
 
 }
 
 
+void WebContents::BeforeUnloadDialogCancelled() {
 
+  if (deferred_load_url_.id) {
 
+    auto& controller = web_contents()->GetController();
 
+    if (!controller.GetPendingEntry()) {
 
+      deferred_load_url_.id = 0;
 
+    }
 
+  }
 
+}
 
+
 
 void WebContents::DevToolsReloadPage() {
 
   Emit("devtools-reload-page");
 
 }

+ 1 - 0
atom/browser/api/atom_api_web_contents.h
View File 

@@ -340,6 +340,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
   void Observe(int type,
 
                const content::NotificationSource& source,
 
                const content::NotificationDetails& details) override;
 
+  void BeforeUnloadDialogCancelled() override;
 
 
   // brightray::InspectableWebContentsDelegate:
 
   void DevToolsReloadPage() override;

+ 54 - 0
spec/api-browser-window-spec.js
View File 

@@ -1174,6 +1174,60 @@ describe('BrowserWindow module', function () {
 
       })
 
       w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-empty-string.html'))
 
     })
 
+
 
+    it('emits for each close attempt', function (done) {
 
+      var beforeUnloadCount = 0
 
+      w.on('onbeforeunload', function () {
 
+        beforeUnloadCount++
 
+        if (beforeUnloadCount < 3) {
 
+          w.close()
 
+        } else if (beforeUnloadCount === 3) {
 
+          done()
 
+        }
 
+      })
 
+      w.webContents.once('did-finish-load', function () {
 
+        w.close()
 
+      })
 
+      w.loadURL('file://' + path.join(fixtures, 'api', 'beforeunload-false-prevent3.html'))
 
+    })
 
+
 
+    it('emits for each reload attempt', function (done) {
 
+      var beforeUnloadCount = 0
 
+      w.on('onbeforeunload', function () {
 
+        beforeUnloadCount++
 
+        if (beforeUnloadCount < 3) {
 
+          w.reload()
 
+        } else if (beforeUnloadCount === 3) {
 
+          done()
 
+        }
 
+      })
 
+      w.webContents.once('did-finish-load', function () {
 
+        w.webContents.once('did-finish-load', function () {
 
+          assert.fail('Reload was not prevented')
 
+        })
 
+        w.reload()
 
+      })
 
+      w.loadURL('file://' + path.join(fixtures, 'api', 'beforeunload-false-prevent3.html'))
 
+    })
 
+
 
+    it('emits for each navigation attempt', function (done) {
 
+      var beforeUnloadCount = 0
 
+      w.on('onbeforeunload', function () {
 
+        beforeUnloadCount++
 
+        if (beforeUnloadCount < 3) {
 
+          w.loadURL('about:blank')
 
+        } else if (beforeUnloadCount === 3) {
 
+          done()
 
+        }
 
+      })
 
+      w.webContents.once('did-finish-load', function () {
 
+        w.webContents.once('did-finish-load', function () {
 
+          assert.fail('Navigation was not prevented')
 
+        })
 
+        w.loadURL('about:blank')
 
+      })
 
+      w.loadURL('file://' + path.join(fixtures, 'api', 'beforeunload-false-prevent3.html'))
 
+    })
 
   })
 
 
   describe('new-window event', function () {

+ 17 - 0
spec/fixtures/api/beforeunload-false-prevent3.html
View File 

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