X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Fsteps.html;h=68e77264472c48119359d38122073bd60f2ef161;hb=bf7d192b5aef6ea82e7e627d4cfcfca1cb978f23;hp=42b73629005fa83b275d71be39247e2f95612228;hpb=117b8bee20ce2bf7d36668af054285244d438b5c;p=dygraphs.git

diff --git a/tests/steps.html b/tests/steps.html
index 42b7362..68e7726 100644
--- a/tests/steps.html
+++ b/tests/steps.html
@@ -1,11 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
     <title>dygraph</title>
-    <!--[if IE]>
-    <script type="text/javascript" src="../excanvas.js"></script>
-    <![endif]-->
     <!--
     For production (minified) code, use:
     <script type="text/javascript" src="dygraph-combined.js"></script>
@@ -131,7 +127,11 @@
         labels: ["Date","GapSeries1","GapSeries2"],
         showRoller: true,
         stepPlot: true,
-        GapSeries2: { axis: {} }
+        series: {
+          GapSeries2: {
+            axis: 'y2'
+          }
+        }
       }
     );
     </script>
@@ -153,6 +153,118 @@
                           includeZero: true
                        });
     </script>
+	
+	<p>9: Mixed mode - step and line:</p>
+    <div id="graphdiv9"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv9"),
+                      "Date,Idle,Used\n" +
+                      "2008-05-07,70,30\n" +
+                      "2008-05-08,12,88\n" +
+                      "2008-05-09,88,12\n" +
+                      "2008-05-10,63,37\n" +
+                      "2008-05-11,35,65\n",
+                      {
+		                series: {
+						  Idle: {stepPlot: true},
+						  Used: {stepPlot: false}
+						},
+						  
+                        fillGraph: false,
+                        stackedGraph: false,
+                        includeZero: true
+                      });
+    </script>
+	
+	
+	<p>10: Mixed mode - step and line (filled):</p>
+    <div id="graphdiv10"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv10"),
+                      "Date,Idle,Used\n" +
+                      "2008-05-07,70,30\n" +
+                      "2008-05-08,12,88\n" +
+                      "2008-05-09,88,12\n" +
+                      "2008-05-10,63,37\n" +
+                      "2008-05-11,35,65\n",
+                      {
+		                series: {
+						  Idle: {stepPlot: false},
+						  Used: {stepPlot: true}
+						},
+						  
+                        fillGraph: true,
+                        stackedGraph: false,
+                        includeZero: true
+                      });
+    </script>
+
+	<p>11: Mixed mode - step and line (stacked and filled):</p>
+    <div id="graphdiv11"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv11"),
+                      "Date,Idle,Used,NotUsed,Active\n" +
+                      "2008-05-07,60,30,5,5\n" +
+                      "2008-05-08,12,73,5,10\n" +
+                      "2008-05-09,38,12,30,20\n" +
+                      "2008-05-10,50,17,23,10\n" +
+                      "2008-05-11,35,25,35,5\n",
+                      {
+		                series: {
+						  Idle: {stepPlot: false},
+						  Used: {stepPlot: true},
+						  NotUsed: {stepPlot: false},
+						  Active: {stepPlot: true}						     
+                        },
+                        fillGraph: true,
+                        stackedGraph: true,
+                        includeZero: true
+                      });
+    </script>
+	
+	<p>12: Mixed mode - step and line (errorbars):</p>
+    <div id="graphdiv12"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv12"),
+        [
+          [1, [75, 2], [50, 3]],
+          [2, [70, 5], [90, 4]],
+          [3, [80, 7], [112, 5]],
+          [4, [55, 3], [100, 2]],
+          [5, [69, 4], [85, 6]]
+        ],	
+        {		   
+          errorBars: true,
+          labels: ["X", "Data1", "Data2"],
+		  series: {
+		    Data1: {stepPlot: true},	
+		    Data2: {stepPlot: false} 
+		  }
+        }
+	  );
+    </script>
+	
+	<p>13: Mixed mode - step and line (custombars):</p>
+    <div id="graphdiv13"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv13"),
+        [
+          [1, [73, 75, 78], [50, 55, 70]],
+          [2, [65, 70, 75], [83, 91, 99]],
+          [3, [75, 85, 90], [98, 107, 117]],
+          [4, [55, 58, 61], [93, 102, 105]],
+          [5, [69, 73, 85], [80, 85, 87]]
+        ],	
+        {
+          customBars: true,
+          labels: ["X", "Data1", "Data2"],
+		  series: {
+		    Data1: {stepPlot: true},	
+		    Data2: {stepPlot: false} 
+		  }
+        }
+	  );
+    </script>
 
   </body>
 </html>
