projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 90eacdc)
all tests pass in IE8!
authorDan Vanderkam <danvk@google.com>
Fri, 4 Dec 2009 01:19:37 +0000 (17:19 -0800)
committerDan Vanderkam <danvk@google.com>
Fri, 4 Dec 2009 01:19:37 +0000 (17:19 -0800)
13 files changed:
tests/callback.html patch | blob | blame | history
tests/crosshair.html patch | blob | blame | history
tests/customLabel.html patch | blob | blame | history
tests/grid_dot.html patch | blob | blame | history
tests/hourly.html patch | blob | blame | history
tests/missing-data.html patch | blob | blame | history
tests/native-format.html patch | blob | blame | history
tests/noise.html patch | blob | blame | history
tests/numeric-axis.html patch | blob | blame | history
tests/perf.html patch | blob | blame | history
tests/plotter.html patch | blob | blame | history
tests/spacing.html patch | blob | blame | history
tests/two-series.html patch | blob | blame | history

diff --git a/tests/callback.html b/tests/callback.html
index 89ba63d..7f9d278 100644 (file)
--- a/tests/callback.html
+++ b/tests/callback.html
@@ -11,7 +11,7 @@
   </head>
   <body>
     <p>Hover, click and zoom to test the callbacks:</p>
-    <div id="g" style="width:600px; height:300px;"></div>
+    <div id="div_g" style="width:600px; height:300px;"></div>
 
     <div id="status" style="width:100%; height:200px;"></div>
 
@@ -28,7 +28,7 @@
       };
 
       g = new Dygraph(
-            document.getElementById("g"),
+            document.getElementById("div_g"),
             NoisyData, {
               rollPeriod: 7,
               showRoller: true,
diff --git a/tests/crosshair.html b/tests/crosshair.html
index 4dbadc8..3d8a254 100644 (file)
--- a/tests/crosshair.html
+++ b/tests/crosshair.html
@@ -11,14 +11,14 @@
   </head>
   <body>
     <p>Hover, click and zoom to test the callbacks:</p>
-    <div id="g" style="width:600px; height:300px; position:relative;">
+    <div id="div_g" style="width:600px; height:300px; position:relative;">
     </div>
 
     <script type="text/javascript">
       var lines = [];
       var xline;
       g = new Dygraph(
-            document.getElementById("g"),
+            document.getElementById("div_g"),
             NoisyData, {
               rollPeriod: 7,
               showRoller: true,
@@ -31,15 +31,7 @@
                   if (i == 0) xline.style.left = pts[i].canvasx + "px";
                 }
 
-              },
-
-              // clickCallback: function(e, x, pts) {
-              //   s.innerHTML += "<b>Click</b> " + pts_info(x,pts) + "<br/>";
-              // },
-
-              // zoomCallback: function(minX, maxX) {
-              //   s.innerHTML += "<b>Zoom</b> [" + minX + ", " + maxX + "]<br/>";
-              // }
+              }
             }
           );
 
@@ -49,7 +41,7 @@
         line.style.height = "1px";
         line.style.backgroundColor = "black";
         line.style.position = "absolute";
-        document.getElementById("g").appendChild(line);
+        document.getElementById("div_g").appendChild(line);
         lines.push(line);
       }
 
@@ -59,7 +51,7 @@
       xline.style.top = "0px";
       xline.style.backgroundColor = "black";
       xline.style.position = "absolute";
-      document.getElementById("g").appendChild(xline);
+      document.getElementById("div_g").appendChild(xline);
     </script>
   </body>
 </html>
diff --git a/tests/customLabel.html b/tests/customLabel.html
index 8753183..a8e72a3 100644 (file)
--- a/tests/customLabel.html
+++ b/tests/customLabel.html
@@ -11,11 +11,11 @@
   </head>
   <body>
     <p>Labels are transparent and repositioned:</p>
-    <div id="g14" style="width:600px; height:300px;"></div>
+    <div id="div_g14" style="width:600px; height:300px;"></div>
 
     <script type="text/javascript">
       g14 = new Dygraph(
-            document.getElementById("g14"),
+            document.getElementById("div_g14"),
             NoisyData, {
               rollPeriod: 14,
               errorBars: true,
diff --git a/tests/grid_dot.html b/tests/grid_dot.html
index 2f01242..1fd5e88 100644 (file)
--- a/tests/grid_dot.html
+++ b/tests/grid_dot.html
@@ -4,7 +4,9 @@
     <!--[if IE]>
     <script type="text/javascript" src="excanvas.js"></script>
     <![endif]-->
-    <script type="text/javascript" src="../dygraph-combined.js"></script>
+    <!--<script type="text/javascript" src="../dygraph-combined.js"></script>-->
+    <script type="text/javascript" src="../strftime/strftime-min.js"></script>
+    <script type="text/javascript" src="../rgbcolor/rgbcolor.js"></script>
     <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>
@@ -12,11 +14,11 @@
 
   <body>
     <p>Dot and lines should be extra large. Grid is red.</p>
-    <div id="g14" style="width:600px; height:300px;"></div>
+    <div id="div_g14" style="width:600px; height:300px;"></div>
 
     <script type="text/javascript">
       g14 = new Dygraph(
-            document.getElementById("g14"),
+            document.getElementById("div_g14"),
             NoisyData, {
               rollPeriod: 14,
               errorBars: true,
diff --git a/tests/hourly.html b/tests/hourly.html
index f4e9301..c0bb77f 100644 (file)
--- a/tests/hourly.html
+++ b/tests/hourly.html
@@ -10,17 +10,17 @@
   </head>
   <body>
     <p>Hourly data:</p>
-    <div id="g" style="width:600px; height:300px;"></div>
+    <div id="div_g" style="width:600px; height:300px;"></div>
 
     <p>Minutely data:</p>
-    <div id="gm" style="width:600px; height:300px;"></div>
+    <div id="div_gm" style="width:600px; height:300px;"></div>
 
     <p>Secondly data:</p>
-    <div id="gs" style="width:600px; height:300px;"></div>
+    <div id="div_gs" style="width:600px; height:300px;"></div>
 
     <script type="text/javascript">
       g = new Dygraph(
-            document.getElementById("g"),
+            document.getElementById("div_g"),
             function HourlyData() {
               return "" +
               "Date,A,B\n" +
@@ -35,7 +35,7 @@
           );
 
       gm = new Dygraph(
-            document.getElementById("gm"),
+            document.getElementById("div_gm"),
             function() {
               var ret = "Date,Hours,Minutes\n";
               var zp = function(x) { if (x<10) return "0"+x; else return ""+x;};
@@ -52,7 +52,7 @@
           );
 
       gs = new Dygraph(
-            document.getElementById("gs"),
+            document.getElementById("div_gs"),
             function() {
               var ret = "Date,Minutes,Seconds\n";
               var zp = function(x) { if (x<10) return "0"+x; else return ""+x;};
diff --git a/tests/missing-data.html b/tests/missing-data.html
index cec653c..68101e4 100644 (file)
--- a/tests/missing-data.html
+++ b/tests/missing-data.html
@@ -58,7 +58,7 @@
         [4, [null, 2], [20, 3]],
         [5, [null, 2], [null, 3]],
         [6, [ 9, 2], [20, 3]],
-        [7, [10, 2], [20, 3]],
+        [7, [10, 2], [20, 3]]
       ],
       {
         errorBars: true,
@@ -75,7 +75,7 @@
         [4, [null, 2], [20, 3]],
         [5, [null, 2], [null, 3]],
         [6, [ 9, 2], [20, 3]],
-        [7, [10, 2], [20, 3]],
+        [7, [10, 2], [20, 3]]
       ],
       {
         errorBars: true,
diff --git a/tests/native-format.html b/tests/native-format.html
index 16bd9f1..6f96be4 100644 (file)
--- a/tests/native-format.html
+++ b/tests/native-format.html
@@ -25,11 +25,11 @@
     <div id="graphdiv2"></div>
     <script type="text/javascript">
       g2 = new Dygraph(document.getElementById("graphdiv2"),
-                       [ 
+                       [
                          [1,10,100],
                          [2,20,80],
                          [3,50,60],
-                         [4,70,80],
+                         [4,70,80]
                        ],
                        {
                          labels: [ "x", "A", "B" ]
diff --git a/tests/noise.html b/tests/noise.html
index a589fb3..8c02ee2 100644 (file)
--- a/tests/noise.html
+++ b/tests/noise.html
@@ -11,20 +11,20 @@
   </head>
   <body>
     <p>7-day rollup:</p>
-    <div id="g" style="width:600px; height:300px;"></div>
+    <div id="div_g" style="width:600px; height:300px;"></div>
     <p>14-Day Rollup:</p>
-    <div id="g30" style="width:600px; height:300px;"></div>
+    <div id="div_g30" style="width:600px; height:300px;"></div>
 
     <script type="text/javascript">
       g = new Dygraph(
-            document.getElementById("g"),
+            document.getElementById("div_g"),
             NoisyData, {
               rollPeriod: 7,
               errorBars: true
             }
           );
       g30 = new Dygraph(
-            document.getElementById("g30"),
+            document.getElementById("div_g30"),
             NoisyData().replace(/,/g, "\t"), {
               rollPeriod: 14,
               errorBars: true
diff --git a/tests/numeric-axis.html b/tests/numeric-axis.html
index f300f5f..fc5b0e8 100644 (file)
--- a/tests/numeric-axis.html
+++ b/tests/numeric-axis.html
@@ -11,14 +11,14 @@
   </head>
   <body>
     <p>CSV data source:</p>
-    <div id="g" style="width:600px; height:300px;"></div>
+    <div id="div_g" style="width:600px; height:300px;"></div>
 
     <p>GViz data source:</p>
     <div id="gviz" style="width:600px; height:300px;"></div>
 
     <script type="text/javascript">
       g = new Dygraph(
-            document.getElementById("g"),
+            document.getElementById("div_g"),
             function() {
               var ret = "X,Y1,Y2\n";
               for (var i = 0; i < 100; i++) {
diff --git a/tests/perf.html b/tests/perf.html
index 789e21d..6515dee 100644 (file)
--- a/tests/perf.html
+++ b/tests/perf.html
@@ -10,7 +10,7 @@
     <script type="text/javascript" src="data.js"></script>
   </head>
   <body>
-    <div id="g" style="width:600px; height:300px;"></div>
+    <div id="div_g" style="width:600px; height:300px;"></div>
     <div id="status"></div>
 
     <script type="text/javascript">
@@ -21,7 +21,7 @@
       for (var i = 0; i < num_tests; i++) {
         var this_start = new Date;
         g = new Dygraph(
-              document.getElementById("g"),
+              document.getElementById("div_g"),
               NoisyData, {
                 rollPeriod: 7,
                 errorBars: true
@@ -35,7 +35,7 @@
 
       document.getElementById("status").innerHTML = "Elapsed time: " + (end - start)/num_tests + " ms/instantiation";
       new Dygraph(
-        document.getElementById("g"),
+        document.getElementById("div_g"),
         times, {
           labels: [ "Iteration", "Time (ms)" ]
         }
diff --git a/tests/plotter.html b/tests/plotter.html
index f36573b..af9968d 100644 (file)
--- a/tests/plotter.html
+++ b/tests/plotter.html
@@ -12,7 +12,7 @@
         var eq = document.getElementById("eq").value;
         eval("fn = " + eq);
 
-        var graph = document.getElementById("graph");
+        var graph = document.getElementById("graph_div");
         var width = parseInt(graph.style.width);
         var x1 = parseFloat(document.getElementById("x1").value);
         var x2 = parseFloat(document.getElementById("x2").value);
@@ -72,6 +72,6 @@
     to <input type=text width="5" id="x2" value="10" /></p>
     <p><input type=button value="Plot" onClick="plot()" /></p>
 
-    <div id=graph style="width:1024px; height:400px;"></div>
+    <div id="graph_div" style="width:1024px; height:400px;"></div>
   </body>
 </html>
diff --git a/tests/spacing.html b/tests/spacing.html
index f249dcb..386dcc2 100644 (file)
--- a/tests/spacing.html
+++ b/tests/spacing.html
@@ -11,21 +11,21 @@
   </head>
   <body>
     <p>Wide</p>
-    <div id="g" style="width:800px; height:300px;"></div>
+    <div id="div_g" style="width:800px; height:300px;"></div>
 
     <p>Narrow</p>
-    <div id="g2" style="width:300px; height:200px;"></div>
+    <div id="div_g2" style="width:300px; height:200px;"></div>
 
     <script type="text/javascript">
       g = new Dygraph(
-            document.getElementById("g"),
+            document.getElementById("div_g"),
             data, {
               rollPeriod: 7,
               pixelsPerYLabel: 20
             }
           );
       g2 = new Dygraph(
-            document.getElementById("g2"),
+            document.getElementById("div_g2"),
             data, {
               rollPeriod: 7,
               pixelsPerYLabel: 20
diff --git a/tests/two-series.html b/tests/two-series.html
index 0ce6134..f12036d 100644 (file)
--- a/tests/two-series.html
+++ b/tests/two-series.html
@@ -11,17 +11,17 @@
   </head>
   <body>
     <p>No rollup:</p>
-    <div id="g" style="width:600px; height:300px;"></div>
+    <div id="div_g" style="width:600px; height:300px;"></div>
     <p>30-Day Rollup:</p>
-    <div id="g30" style="width:600px; height:300px;"></div>
+    <div id="div_g30" style="width:600px; height:300px;"></div>
 
     <script type="text/javascript">
       g = new Dygraph(
-            document.getElementById("g"),
+            document.getElementById("div_g"),
             data, {}
           );
       g30 = new Dygraph(
-            document.getElementById("g30"),
+            document.getElementById("div_g30"),
             data, {
               rollPeriod: 30
             }
danvk/dygraphs fork supporting touch events