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

Merge branch 'webcontent_invalid_loadurl_patch' of https://github.com/deepak1556/atom-shell into deepak1556-webcontent_invalid_loadurl_patch

Cheng Zhao 9 years ago
parent
e244d0db0c 5a8bebc2f8
commit
08e5c1f6fe
3 changed files with 29 additions and 2 deletions
Split View Show Diff Stats
  1. 8 0
      atom/browser/api/atom_api_web_contents.cc
  2. 12 2
      spec/api-browser-window-spec.js
  3. 9 0
      spec/fixtures/pages/process-exit.html

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

@@ -710,6 +710,14 @@ bool WebContents::Equal(const WebContents* web_contents) const {
 
 }
 
 
 void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
 
+  if (!url.is_valid()) {
 
+    Emit("did-fail-load",
 
+         static_cast<int>(net::ERR_INVALID_URL),
 
+         net::ErrorToShortString(net::ERR_INVALID_URL),
 
+         url.possibly_invalid_spec());
 
+    return;
 
+  }
 
+
 
   content::NavigationController::LoadURLParams params(url);
 
 
   GURL http_referrer;

+ 12 - 2
spec/api-browser-window-spec.js
View File 

@@ -102,12 +102,22 @@ describe('browser-window module', function() {
 
       w.loadURL('about:blank');
 
     });
 
 
-    it('should emit did-fail-load event', function(done) {
 
-      w.webContents.on('did-fail-load', function() {
 
+    it('should emit did-fail-load event for files that do not exist', function(done) {
 
+      w.webContents.on('did-fail-load', function(event, code) {
 
+        assert.equal(code, -6);
 
         done();
 
       });
 
       w.loadURL('file://a.txt');
 
     });
 
+
 
+    it('should emit did-fail-load event for invalid URL', function(done) {
 
+      w.webContents.on('did-fail-load', function(event, code, desc) {
 
+        assert.equal(desc, 'ERR_INVALID_URL');
 
+        assert.equal(code, -300);
 
+        done();
 
+      });
 
+      w.loadURL('http://example:port');
 
+    });
 
   });
 
 
   describe('BrowserWindow.show()', function() {

+ 9 - 0
spec/fixtures/pages/process-exit.html
View File 

@@ -0,0 +1,9 @@
 
+<html>
 
+<body>
 
+<script type="text/javascript" charset="utf-8">
 
+process.on('exit', function() {
 
+  
+});
 
+</script>
 
+</body>
 
+</html>