X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Finteraction.html;h=8b6484338b2a8aa2d2c1658ea31374561861e793;hb=77ad1333ba9d129938e6d03c063ada46ad1f98ab;hp=972b0a32d6f60b9d8441915763c9a4eed84d8ce1;hpb=a13309c00be29d09bdd4e9d9fc7664a2466a6a01;p=dygraphs.git

diff --git a/tests/interaction.html b/tests/interaction.html
index 972b0a3..8b64843 100644
--- a/tests/interaction.html
+++ b/tests/interaction.html
@@ -1,14 +1,13 @@
-
+<!DOCTYPE html>
 <html>
   <head>
     <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>
+    <!--
+    For production (minified) code, use:
+    <script type="text/javascript" src="dygraph-combined.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,7 +21,9 @@
     <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>
 
@@ -46,18 +47,25 @@
     </table>
         
     <script type="text/javascript">
-      Dygraph.addEvent(document, "mousewheel", function() { suspendGraphScroll(); });
-      Dygraph.addEvent(document, "mousedown", function() { clearGraphScroll(); });
-      Dygraph.addEvent(document, "mousemove", function() { clearGraphScroll(); });
+      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
       }});
