X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=gallery%2Finteraction.js;h=a90373754e7bf29d485b42ecc7c083a1dc406bc1;hb=c4c10db644336a08b581e2efdb3ad75b950c905c;hp=69a812cdb8b6e9ec44e6210b2a24df21c85a1468;hpb=56f64289bdbd75dea1ee58faf529d39465d11008;p=dygraphs.git

diff --git a/gallery/interaction.js b/gallery/interaction.js
index 69a812c..a903737 100644
--- a/gallery/interaction.js
+++ b/gallery/interaction.js
@@ -1,3 +1,6 @@
+/*global Gallery,Dygraph,data */
+/*global NoisyData,downV3,moveV3,upV3,clickV3,dblClickV3,scrollV3,restorePositioning,downV4,moveV4,upV4,dblClickV4,captureCanvas */
+
 Gallery.register(
   'interaction',
   {
@@ -5,7 +8,7 @@ Gallery.register(
     title: 'title',
     setup: function(parent) {
       parent.innerHTML = [
-          "<h2>Default interaction model</h2>",
+          "<h3>Default interaction model</h3>",
           "<div style='width:600px;'>",
           "  <p style='text-align:center;'>",
           "    Zoom: click-drag, Pan: shift-click-drag, Restore: double-click",
@@ -13,7 +16,7 @@ Gallery.register(
           "  <div id='div_g' style='width:600px; height:300px;'></div>",
           "</div>",
           "",
-          "<h2>Empty interaction model</h2>",
+          "<h3>Empty interaction model</h3>",
           "<div style='width:600px;'>",
           "  <p style='text-align:center;'>",
           "    Click and drag all you like, it won't do anything!",
@@ -22,7 +25,7 @@ Gallery.register(
           "</div>",
           "<div id='g2_console'></div>", // what is this?
           "",
-          "<h2>Custom interaction model</h2>",
+          "<h3>Custom interaction model</h3>",
           "<div style='width:600px;'>",
           "  <p style='text-align:center;'>",
           "    Zoom in: double-click, scroll wheel<br/>",
@@ -34,25 +37,24 @@ Gallery.register(
           "  <button id='restore3'>Restore position</button>",
           "  <div id='div_g3' style='width:600px; height:300px;'></div>",
           "</div>",
-          "<h2>Fun model!</h2>",
+          "<h3>Fun model!</h3>",
           "<div style='width:600px;'>",
           "  <p style='text-align:center;'>",
           "    Keep the mouse button pressed, and hover over all points",
           "    to mark them.",
           "  </p>",
           "  <div id='div_g4' style='width:600px; height:300px;'></div>",
-          "</div>",
+          "</div>"
           ].join('\n');
 
     },
     run: function() {
-      // TODO(konigsberg): Add cleanup to remove callbacks.
-      Dygraph.addEvent(document, "mousewheel", function() { lastClickedGraph = null; });
-      Dygraph.addEvent(document, "click", function() { lastClickedGraph = null; });
-      var g = new Dygraph(document.getElementById("div_g"),
+      var lastClickedGraph;
+      document.addEventListener("mousewheel", function() { lastClickedGraph = null; });
+      document.addEventListener("click", function() { lastClickedGraph = null; });
+      new Dygraph(document.getElementById("div_g"),
            NoisyData, { errorBars : true });
-      var s = document.getElementById("g2_console");
-      var g2 = new Dygraph(document.getElementById("div_g2"),
+      new Dygraph(document.getElementById("div_g2"),
            NoisyData,
            {
              errorBars : true,
@@ -69,15 +71,22 @@ Gallery.register(
       }});
       document.getElementById("restore3").onclick = function() {
         restorePositioning(g3);
-      }
-      var g4 = new Dygraph(document.getElementById("div_g4"),
-           NoisyData, { errorBars : true, drawPoints : true, interactionModel : {
-            'mousedown' : downV4,
-            'mousemove' : moveV4,
-            'mouseup' : upV4,
-            'dblclick' : dblClickV4,
-           },
-           underlayCallback : captureCanvas
-      });
+      };
+      new Dygraph(document.getElementById("div_g4"),
+           NoisyData, {
+             errorBars : true,
+             drawPoints : true,
+             interactionModel : {
+               'mousedown' : downV4,
+               'mousemove' : moveV4,
+               'mouseup' : upV4,
+               'dblclick' : dblClickV4
+             },
+             underlayCallback : captureCanvas
+          });
+    },
+    clean: function() {
+      document.removeEventListener('mousewheel');
+      document.removeEventListener('click');
     }
   });