Merge branch 'master' into ns-alternative-test-env

2026-01-25 14:59:03 -05:00 · 2015-10-12 15:55:28 -06:00
parent 69e8b0cfb1 b27c1140a7
commit d4c88cc7fd
6 changed files with 76 additions and 9 deletions
--- a/src/browser/atom-window.coffee
+++ b/src/browser/atom-window.coffee
@@ -146,6 +146,8 @@ class AtomWindow
        when 0 then @browserWindow.destroy()
        when 1 then @browserWindow.restart()

+    @browserWindow.webContents.on 'will-navigate', (event) -> event.preventDefault()
+
    @setupContextMenu()

    if @isSpec