From af566ec08aa9a061e7f687c47c0f4b42c6c87dec Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Mon, 3 May 2010 00:25:35 -0700 Subject: [PATCH 1/2] Fix LoadTimeTest, location.host includes the port. --- Tests/Manual/LoadTimeTest/AppController.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Manual/LoadTimeTest/AppController.j b/Tests/Manual/LoadTimeTest/AppController.j index bd1f94618..1638643a2 100644 --- a/Tests/Manual/LoadTimeTest/AppController.j +++ b/Tests/Manual/LoadTimeTest/AppController.j @@ -28,7 +28,7 @@ if (data.length < 10) { // reload with data in the query string - window.location.href = [window.location.protocol, "//", window.location.host, window.location.port, window.location.pathname, "?", encodeURIComponent(JSON.stringify(data))].join(""); + window.location.href = [window.location.protocol, "//", window.location.host, window.location.pathname, "?", encodeURIComponent(JSON.stringify(data))].join(""); } else { From 50c519ec69c0ebf914acfd3197b4557aff8fcb10 Mon Sep 17 00:00:00 2001 From: Randall Luecke Date: Mon, 3 May 2010 17:34:12 -0400 Subject: [PATCH 2/2] Fixed issue with CPWebView where document.body didn't exist when reloaded quickly. --- AppKit/CPWebView.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPWebView.j b/AppKit/CPWebView.j index 38ddfb5fa..cd4876675 100644 --- a/AppKit/CPWebView.j +++ b/AppKit/CPWebView.j @@ -187,7 +187,7 @@ CPWebViewScrollNative = 2; var win = null; try { win = [self DOMWindow]; } catch (e) {} - if (win && win.document) + if (win && win.document && win.document.body) { var width = win.document.body.scrollWidth, height = win.document.body.scrollHeight;