2.0.0 release fixes (#815)

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

index e6d103e..37e1846 100644 (file)
--- a/tests/interaction.html
+++ b/tests/interaction.html
@@ -1,14 +1,10 @@
-
+<!DOCTYPE html>
  <html>
    <head>
+    <link rel="stylesheet" href="../dist/dygraph.css">
      <title>interaction model</title>
-    <!--[if IE]>
-    <script type="text/javascript" src="../excanvas.js"></script>
-    <![endif]-->
-    <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="../dist/dygraph.js"></script>
+
      <script type="text/javascript" src="data.js"></script>
      <script type="text/javascript" src="interaction.js"></script>
    </head>
@@ -22,11 +18,13 @@
      <tr><td>
      <b>No interaction model</b>
      <div id="div_g2" style="width:600px; height:300px;"></div>
-    </td><td>Click and drag all you like, it won't do anything!</td></tr>
+    </td><td>Click and drag all you like, it won't do anything!
+    <div id="g2_console"></div>
+    </td></tr>
      <tr><td>
      <b>Custom interaction model</b>
  
-    <input type="button" value="Unzoom" onclick="unzoomGraph(g3)">
+    <input type="button" value="Restore position" onclick="restorePositioning(g3)">
      <div id="div_g3" style="width:600px; height:300px;"></div>
      </td><td>
      Zoom in: double-click, scroll wheel<br/>
@@ -46,15 +44,25 @@
      </table>
          
      <script type="text/javascript">
+      document.addEventListener("mousewheel", function() {
+        lastClickedGraph = null;
+      }, false);
+      document.addEventListener("click", function() { lastClickedGraph = null; }, false);
        var g = new Dygraph(document.getElementById("div_g"),
             NoisyData, { errorBars : true });
+      var s = document.getElementById("g2_console");
        var g2 = new Dygraph(document.getElementById("div_g2"),
-           NoisyData, { errorBars : true, interactionModel : {} });
+           NoisyData,
+           {
+             errorBars : true,
+             interactionModel: {}
+           });
        var g3 = new Dygraph(document.getElementById("div_g3"),
             NoisyData, { errorBars : true, interactionModel : {
          'mousedown' : downV3,
          'mousemove' : moveV3,
          'mouseup' : upV3,
+        'click' : clickV3,
          'dblclick' : dblClickV3,
          'mousewheel' : scrollV3
        }});