Merge branch 'master' of github.com:280north/cappuccino

This commit is contained in:
Francisco Ryan Tolmasky I committed 2010-05-04 03:32:51 -07:00
commit efe4d5f339
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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
{