X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Fper-series.html;h=84730b163df3d396192df8ff0a30bd963bcbc86b;hb=e03f3a93d45459a9748050d1d38149494975b3d9;hp=98501acd94df990fafd052ce4ece8788c7f06ed8;hpb=79253bd07d1fd37d53e0793c08030df4aaf871be;p=dygraphs.git

diff --git a/tests/per-series.html b/tests/per-series.html
index 98501ac..84730b1 100644
--- a/tests/per-series.html
+++ b/tests/per-series.html
@@ -18,6 +18,8 @@
     <div id="demodiv"></div>
     <h2>Chart with per-series properties with legend.</h2>
     <div id="demodiv2"></div>
+    <h2>First graph, using old-style series specification.</h2>
+    <div id="demodiv3"></div>
     <script type="text/javascript">
       data = function() {
         var zp = function(x) { if (x < 10) return "0"+x; else return x; };
@@ -38,56 +40,85 @@
               data,
               {
                 strokeWidth: 2,
+		series : {
+                  'parabola': {
+                    strokeWidth: 0.0,
+                    drawPoints: true,
+                    pointSize: 4,
+                    highlightCircleSize: 6
+                  },
+                  'line': {
+                    strokeWidth: 1.0,
+                    drawPoints: true,
+                    pointSize: 1.5
+                  },
+                  'sine wave': {
+                    strokeWidth: 3,
+                    highlightCircleSize: 10
+                  },
+                  'sine wave2': {
+                    strokePattern: [10, 2, 5, 2],
+                    strokeWidth: 2,
+                    highlightCircleSize: 3
+                  }
+                }
+              }
+          );
+      g2 = new Dygraph(
+              document.getElementById("demodiv2"),
+              data,
+              {
+                legend: 'always',
+                strokeWidth: 2,
                 'parabola': {
-                  strokeWidth: 0.0,
+                  strokePattern: null,
                   drawPoints: true,
                   pointSize: 4,
                   highlightCircleSize: 6
                 },
                 'line': {
+                  strokePattern: Dygraph.DASHED_LINE,
                   strokeWidth: 1.0,
                   drawPoints: true,
                   pointSize: 1.5
                 },
+                'another line': {
+                  strokePattern: [25, 5]
+                },
                 'sine wave': {
+                  strokePattern: Dygraph.DOTTED_LINE,
                   strokeWidth: 3,
                   highlightCircleSize: 10
                 },
                 'sine wave2': {
-                  strokePattern: [10, 2, 5, 2],
+                  strokePattern: Dygraph.DOT_DASH_LINE,
                   strokeWidth: 2,
                   highlightCircleSize: 3
                 }
               }
           );
-      g2 = new Dygraph(
-              document.getElementById("demodiv2"),
+      g3 = new Dygraph(
+              document.getElementById("demodiv3"),
               data,
               {
-                legend: 'always',
                 strokeWidth: 2,
                 'parabola': {
-                  strokePattern: null,
+                  strokeWidth: 0.0,
                   drawPoints: true,
                   pointSize: 4,
                   highlightCircleSize: 6
                 },
                 'line': {
-                  strokePattern: Dygraph.DASHED_LINE,
                   strokeWidth: 1.0,
                   drawPoints: true,
                   pointSize: 1.5
                 },
-                'another line': {
-                  strokePattern: [25, 5]
-                },
                 'sine wave': {
-                  strokePattern: Dygraph.DOTTED_LINE,
                   strokeWidth: 3,
                   highlightCircleSize: 10
                 },
                 'sine wave2': {
-                  strokePattern: Dygraph.DOT_DASH_LINE,
+                  strokePattern: [10, 2, 5, 2],
                   strokeWidth: 2,
                   highlightCircleSize: 3
                 }