Bug fix for dygraph point selection touch event.

[dygraphs.git] / tests / custom-circles.html
diff --git a/tests/custom-circles.html b/tests/custom-circles.html

index f2ef094..8a25d4b 100644 (file)
--- a/tests/custom-circles.html
+++ b/tests/custom-circles.html
@@ -1,16 +1,10 @@
  <!DOCTYPE html>
  <html>
    <head>
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
+    <link rel="stylesheet" href="../dist/dygraph.css">
      <title>Custom Circles</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>
-    -->
-    <script type="text/javascript" src="../dygraph-dev.js"></script>
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
+    <script type="text/javascript" src="../src/extras/shapes.js"></script>
  
    </head>
    <body>
@@ -31,13 +25,15 @@
              drawPoints : true,
              pointSize : 5,
              highlightCircleSize: 8,
-            A : {
-              drawPointCallback : Dygraph.Circles.TRIANGLE,
-              drawHighlightPointCallback : Dygraph.Circles.TRIANGLE
-            },
-            B : {
-              drawPointCallback : Dygraph.Circles.HEXAGON,
-              drawHighlightPointCallback : Dygraph.Circles.HEXAGON
+            series : {
+              A : {
+                drawPointCallback : Dygraph.Circles.TRIANGLE,
+                drawHighlightPointCallback : Dygraph.Circles.TRIANGLE
+              },
+              B : {
+                drawPointCallback : Dygraph.Circles.HEXAGON,
+                drawHighlightPointCallback : Dygraph.Circles.HEXAGON
+              }
              }
          });
  
@@ -95,7 +91,8 @@
          var shapes = [];
          var addShape = function(name, pointFn, highlightPointFn) {
            shapes.push(name);
-          opts[name] = {
+          if (!opts['series']) opts['series'] = {};
+          opts.series[name] = {
              drawPointCallback: pointFn,
              drawHighlightPointCallback: highlightPointFn
            };