From: Dan Vanderkam Date: Thu, 2 Jun 2011 19:06:13 +0000 (-0400) Subject: Merge branch 'master' into split X-Git-Tag: v1.0.0~476 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=2d9596f2fd2a3c8d8d064c0f68a22c69ef82626b;hp=74a5af31a87b245b89337037bc33a0e900153eae;p=dygraphs.git Merge branch 'master' into split --- diff --git a/dygraph.js b/dygraph.js index c9ec765..d1052b3 100644 --- a/dygraph.js +++ b/dygraph.js @@ -3715,7 +3715,8 @@ Dygraph.prototype.start_ = function() { var caller = this; req.onreadystatechange = function () { if (req.readyState == 4) { - if (req.status == 200) { + if (req.status == 200 || // Normal http + req.status == 0) { // Chrome w/ --allow-file-access-from-files caller.loadedEvent_(req.responseText); } } diff --git a/tests/resize.html b/tests/resize.html index 80d6069..5efe690 100644 --- a/tests/resize.html +++ b/tests/resize.html @@ -11,6 +11,11 @@ +