X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=gallery%2Fplotter.js;h=be39eb3dd1695843dfe000be4f69ac3d0df85056;hb=5c227b7e2a0544347eb27b2722c14179507af835;hp=14283c7351ac3ff21181c096ac6d1696b725f8fc;hpb=795b16307db2a673ba7aa3452f6f6b0e93baeb3a;p=dygraphs.git

diff --git a/gallery/plotter.js b/gallery/plotter.js
index 14283c7..be39eb3 100644
--- a/gallery/plotter.js
+++ b/gallery/plotter.js
@@ -2,34 +2,35 @@
 Gallery.register(
   'plotter',
   {
-    name: 'Plotter',
-    title: 'title',
+    name: 'Function Plotter',
+    title: 'Define your data with functions',
     setup: function(parent) {
-      parent.innerHTML =
-        "<p><b>Equation: </b><br/>\n" +
-        "<textarea cols='80' rows='10' id='eq'>function(x) {\n" +
-        "  return [0.1 * x, 0.1 * x + Math.sin(x), 0.1*x + Math.cos(x)];\n" +
-        "}</textarea><br/>\n" +
-        "<b>Preset functions:</b> <select id='presets' onchange='preset()'>\n" +
-        "<option id='custom'>(custom)</option>\n" +
-        "<option id='id'>Identity</option>\n" +
-        "<option id='sine'>Sine Wave</option>\n" +
-        "<option id='taylor'>Taylor series</option>\n" +
-        "<option selected id='sawtooth'>Sawtooth</option>\n" +
-        "</select>\n" +
-        "    </p>\n" +
-        "\n" +
-        "    <p><b>x range: </b> <input type='text' width='5' id='x1' value='-10' />\n" +
-        "    to <input type='text' width='5' id='x2' value='10' /></p>\n" +
-        "    <p><input type=button value='Plot' onClick='plot()' /></p>\n" +
-        "\n" +
-        "    <div id='graph_div' style='width:800px; height:400px;'></div>";
+      parent.innerHTML = [
+        "<p><b>Equation: </b><br/>",
+        "<textarea cols='80' rows='10' id='eq'>function(x) {",
+        "  return [0.1 * x, 0.1 * x + Math.sin(x), 0.1*x + Math.cos(x)];",
+        "}</textarea><br/>",
+        "<b>Preset functions:</b> <select id='presets'>",
+        "<option id='custom'>(custom)</option>",
+        "<option id='id'>Identity</option>",
+        "<option id='sine'>Sine Wave</option>",
+        "<option id='taylor'>Taylor series</option>",
+        "<option selected id='sawtooth'>Sawtooth</option>",
+        "</select>",
+        "</p>",
+        "",
+        "<p><b>x range: </b> <input type='text' width='5' id='x1' value='-10' />",
+        "to <input type='text' width='5' id='x2' value='10' /></p>",
+        "<p><button id='plot'>Plot</button></p>",
+        "",
+        "<div id='graph_div' style='width:600px; height:300px;'></div>"].join("\n");
 
     },
     run: function() {
-      window.preset = function() {
-        var sel = document.getElementById("presets").selectedIndex;
-        var id = document.getElementById("presets").options[sel].id;
+      var select = document.getElementById("presets");
+      select.onchange = function() {
+        var sel = select.selectedIndex;
+        var id = select.options[sel].id;
         var presets = {
           'id': [ -10, 10, 'function(x) {\n  return x;\n}' ],
           'sine': [ -10, 10, 'function(x) {\n  return Math.sin(x);\n}' ],
@@ -44,7 +45,8 @@ Gallery.register(
         plot();
       }
 
-      window.plot = function() {
+      var plotButton = document.getElementById("plot");
+      var plot = function() {
         var eq = document.getElementById("eq").value;
         eval("fn = " + eq);
 
@@ -71,5 +73,7 @@ Gallery.register(
 
         g = new Dygraph(graph, data);
       }
+      plot.onclick = plot;
+      plot();
     }
   });