X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=gallery%2Fdrawing.js;h=d4da18da60cbcbc6df11f63292fc5e752f7a3b96;hb=64f1c4dfd7425931fcd1bd9949157c0ba6958656;hp=b25341bb2e20f82816c997bccfb6ae9e628e21ab;hpb=15e340f4441909628981699e6d0b374b0e98177e;p=dygraphs.git

diff --git a/gallery/drawing.js b/gallery/drawing.js
index b25341b..d4da18d 100644
--- a/gallery/drawing.js
+++ b/gallery/drawing.js
@@ -1,3 +1,4 @@
+/*global Gallery,Dygraph,data */
 Gallery.register(
   'drawing',
   {
@@ -16,26 +17,27 @@ Gallery.register(
     },
 
     run: function() {
+      var change_tool;  // defined below.
       var zoom = document.getElementById('tool_zoom');
-      zoom.onclick = function() { change_tool(zoom) };
+      zoom.onclick = function() { change_tool(zoom); };
       var pencil = document.getElementById('tool_pencil');
-      pencil.onclick = function() { change_tool(pencil) };
+      pencil.onclick = function() { change_tool(pencil); };
       var eraser = document.getElementById('tool_eraser');
-      eraser.onclick = function() { change_tool(eraser) };
+      eraser.onclick = function() { change_tool(eraser); };
 
       var start_date = new Date("2002/12/29").getTime();
       var end_date = new Date().getTime();
       var data = [];
       for (var d = start_date; d < end_date; d += 604800 * 1000) {
         var millis = d + 2 * 3600 * 1000;
-        data.push( [ new Date(new Date(millis).strftime("%Y/%m/%d")), 50 ]);
+        data.push( [ new Date(Dygraph.dateString_(millis)), 50 ]);
       }
-  
+
       var isDrawing = false;
       var lastDrawRow = null, lastDrawValue = null;
       var tool = 'pencil';
       var valueRange = [0, 100];
-  
+
       function setPoint(event, g, context) {
         var graphPos = Dygraph.findPos(g.graphDiv);
         var canvasx = Dygraph.pageX(event) - graphPos.x;
@@ -54,7 +56,7 @@ Gallery.register(
             closest_row = row;
           }
         }
-  
+
         if (closest_row != -1) {
           if (lastDrawRow === null) {
             lastDrawRow = closest_row;
@@ -69,7 +71,9 @@ Gallery.register(
               var val = lastDrawValue + coeff * (row - lastDrawRow);
               val = Math.max(valueRange[0], Math.min(val, valueRange[1]));
               data[row][1] = val;
-              if (val == null || isNaN(val)) console.log(val);
+              if (val === null || value === undefined || isNaN(val)) {
+                console.log(val);
+              }
             } else if (tool == 'eraser') {
               data[row][1] = null;
             }
@@ -80,14 +84,14 @@ Gallery.register(
           g.setSelection(closest_row);  // prevents the dot from being finnicky.
         }
       }
-  
+
       function finishDraw() {
         isDrawing = false;
         lastDrawRow = null;
         lastDrawValue = null;
       }
-  
-      var change_tool = function(tool_div) {
+
+      change_tool = function(tool_div) {
         var ids = ['tool_zoom', 'tool_pencil', 'tool_eraser'];
         for (var i = 0; i < ids.length; i++) {
           var div = document.getElementById(ids[i]);
@@ -98,7 +102,7 @@ Gallery.register(
           }
         }
         tool = tool_div.id.replace('tool_', '');
-  
+
         var dg_div = document.getElementById("draw_div");
         if (tool == 'pencil') {
           dg_div.style.cursor = 'url(images/cursor-pencil.png) 2 30, auto';
@@ -107,10 +111,10 @@ Gallery.register(
         } else if (tool == 'zoom') {
           dg_div.style.cursor = 'crosshair';
         }
-      }
+      };
       change_tool(document.getElementById("tool_pencil"));
-  
-      g = new Dygraph(document.getElementById("draw_div"), data,
+
+      new Dygraph(document.getElementById("draw_div"), data,
           {
             valueRange: valueRange,
             labels: [ 'Date', 'Value' ],
@@ -160,23 +164,29 @@ Gallery.register(
                 var xOffset = g.toDomCoords(axis[0], null)[0];
                 var x = event.offsetX - xOffset;
                 var w = g.toDomCoords(axis[1], null)[0] - xOffset;
-                var xPct = w == 0 ? 0 : (x / w);
-  
+                var xPct = w === 0 ? 0 : (x / w);
+
                 var delta = axis[1] - axis[0];
                 var increment = delta * percentage;
                 var foo = [increment * xPct, increment * (1 - xPct)];
                 var dateWindow = [ axis[0] + foo[0], axis[1] - foo[1] ];
-  
+
                 g.updateOptions({
                   dateWindow: dateWindow
                 });
-                Dygraph.cancelEvent(event);
+                event.preventDefault();
               }
             },
             strokeWidth: 1.5,
             gridLineColor: 'rgb(196, 196, 196)',
-            drawYGrid: false,
-            drawYAxis: false
+            axes: {
+              x: {
+                drawAxis: false
+              },
+              y: {
+                drawGrid: false
+              }
+            }
           });
           window.onmouseup = finishDraw;
       }