projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 74a5af3)
Merge branch 'master' into split
authorDan Vanderkam <dan@dygraphs.com>
Thu, 2 Jun 2011 19:06:13 +0000 (15:06 -0400)
committerDan Vanderkam <dan@dygraphs.com>
Thu, 2 Jun 2011 19:06:13 +0000 (15:06 -0400)
dygraph.js patch | blob | blame | history
tests/resize.html patch | blob | blame | history

diff --git a/dygraph.js b/dygraph.js
index c9ec765..d1052b3 100644 (file)
--- 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 (file)
--- a/tests/resize.html
+++ b/tests/resize.html
@@ -11,6 +11,11 @@
     <script type="text/javascript" src="../dygraph-canvas.js"></script>
     <script type="text/javascript" src="../dygraph.js"></script>
     <script type="text/javascript" src="data.js"></script>
+    <style type="text/css">
+    html, body {
+      height: 100%;
+    }
+    </style>
   </head>
   <body>
     <div id="div_g" style="width:95%; height:95%"></div>
danvk/dygraphs fork supporting touch events