down to 28 warnings

diff --git a/closure-todo.txt b/closure-todo.txt
index 4d794e7..387020b 100644 (file)
--- a/closure-todo.txt
+++ b/closure-todo.txt
@@ -47,5 +47,6 @@ java -jar ../../closure-compiler-read-only/build/compiler.jar --js ../../closure
 As each file is closurized, it can be added as a "--js" parameter.
 
 NOTES
-- Should add .getNumericOption() and .getStringOption() which are aliases for .getOption() but returns number/string, not *.
 - plugin-free code is 59756 compiled; for uglifyjs it's 83031 (30% savings)
+- How to deal with types for callback attributes? Always repeat?
+  Any way to declare these statically?

diff --git a/dygraph-utils.js b/dygraph-utils.js
index 82b0b10..5e7a20b 100644 (file)
--- a/dygraph-utils.js
+++ b/dygraph-utils.js
@@ -159,9 +159,9 @@ Dygraph.getContext = function(canvas) {
 /**
  * Add an event handler. This smooths a difference between IE and the rest of
  * the world.
- * @param { !Element } elem The element to add the event to.
- * @param { string } type The type of the event, e.g. 'click' or 'mousemove'.
- * @param { function(Event):(boolean|undefined) } fn The function to call
+ * @param {!Node} elem The element to add the event to.
+ * @param {string} type The type of the event, e.g. 'click' or 'mousemove'.
+ * @param {function(Event):(boolean|undefined)} fn The function to call
  *     on the event. The function takes one parameter: the event object.
  * @private
  */
@@ -178,9 +178,9 @@ Dygraph.addEvent = function addEvent(elem, type, fn) {
  * Add an event handler. This event handler is kept until the graph is
  * destroyed with a call to graph.destroy().
  *
- * @param { !Element } elem The element to add the event to.
- * @param { string } type The type of the event, e.g. 'click' or 'mousemove'.
- * @param { function(Event):(boolean|undefined) } fn The function to call
+ * @param {!Node} elem The element to add the event to.
+ * @param {string} type The type of the event, e.g. 'click' or 'mousemove'.
+ * @param {function(Event):(boolean|undefined)} fn The function to call
  *     on the event. The function takes one parameter: the event object.
  * @private
  */
@@ -192,7 +192,7 @@ Dygraph.prototype.addAndTrackEvent = function(elem, type, fn) {
 /**
  * Remove an event handler. This smooths a difference between IE and the rest
  * of the world.
- * @param {!Element} elem The element to add the event to.
+ * @param {!Node} elem The element to remove the event from.
  * @param {string} type The type of the event, e.g. 'click' or 'mousemove'.
  * @param {function(?Event):(boolean|undefined)} fn The function to call
  *     on the event. The function takes one parameter: the event object.
@@ -228,7 +228,7 @@ Dygraph.prototype.removeTrackedEvents_ = function() {
  * browser actions, e.g. highlighting text on a double-click.
  * Based on the article at
  * http://www.switchonthecode.com/tutorials/javascript-tutorial-the-scroll-wheel
- * @param { !Event } e The event whose normal behavior should be canceled.
+ * @param {!Event} e The event whose normal behavior should be canceled.
  * @private
  */
 Dygraph.cancelEvent = function(e) {

diff --git a/dygraph.js b/dygraph.js
index 892c836..3b70852 100644 (file)
--- a/dygraph.js
+++ b/dygraph.js
@@ -1025,7 +1025,7 @@ Dygraph.prototype.createInterface_ = function() {
   var enclosing = this.maindiv_;
 
   /** @type {!HTMLDivElement} */
-  this.graphDiv = document.createElement("div");
+  this.graphDiv = /**@type{!HTMLDivElement}*/(document.createElement("div"));
 
   // TODO(danvk): any other styles that are useful to set here?
   this.graphDiv.style.textAlign = 'left';  // This is a CSS "reset"
@@ -1050,6 +1050,8 @@ Dygraph.prototype.createInterface_ = function() {
   // The interactive parts of the graph are drawn on top of the chart.
   this.graphDiv.appendChild(this.hidden_);
   this.graphDiv.appendChild(this.canvas_);
+
+  /** @type {!Element} */
   this.mouseEventElement_ = this.createMouseEventElement_();
 
   /** @type {DygraphLayout} */
@@ -1073,7 +1075,7 @@ Dygraph.prototype.createInterface_ = function() {
     }
   };
 
-  this.addAndTrackEvent(window, 'mouseout', this.mouseOutHandler_);
+  this.addAndTrackEvent(document, 'mouseout', this.mouseOutHandler_);
   this.addAndTrackEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
 
   // Don't recreate and register the resize handler on subsequent calls.
@@ -1085,7 +1087,7 @@ Dygraph.prototype.createInterface_ = function() {
 
     // Update when the window is resized.
     // TODO(danvk): drop frames depending on complexity of the chart.
-    this.addAndTrackEvent(window, 'resize', this.resizeHandler_);
+    this.addAndTrackEvent(document, 'resize', this.resizeHandler_);
   }
 };
 
@@ -1121,11 +1123,11 @@ Dygraph.prototype.destroy = function() {
   this.removeTrackedEvents_();
 
   // remove mouse event handlers (This may not be necessary anymore)
-  Dygraph.removeEvent(window, 'mouseout', this.mouseOutHandler_);
+  Dygraph.removeEvent(document, 'mouseout', this.mouseOutHandler_);
   Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
 
   // remove window handlers
-  Dygraph.removeEvent(window,'resize',this.resizeHandler_);
+  Dygraph.removeEvent(document, 'resize', this.resizeHandler_);
   this.resizeHandler_ = null;
 
   removeRecursive(this.maindiv_);
@@ -1168,7 +1170,7 @@ Dygraph.prototype.createPlotKitCanvas_ = function(canvas) {
 
 /**
  * Creates an overlay element used to handle mouse events.
- * @return {Object} The mouse event element.
+ * @return {!Element} The mouse event element.
  * @private
  */
 Dygraph.prototype.createMouseEventElement_ = function() {
@@ -1502,6 +1504,21 @@ var zoomAnimationFunction_ = function(frame, numFrames) {
 };
 
 /**
+ * Fires the zoomCallback callback.
+ * @param {number} minDate The minimum date to pass to the callback.
+ * @param {number} maxDate The maximum date to pass to the callback.
+ * @private
+ */
+Dygraph.prototype.fireZoomCallback = function(minDate, maxDate) {
+  var zoomCallback =
+    /**@type{?function(number,number,!Array.<!Array.<number>>)}*/(
+        this.attr_('zoomCallback'));
+  if (zoomCallback) {
+    zoomCallback(minDate, maxDate, this.yAxisRanges());
+  }
+};
+
+/**
  * Zoom to something containing [minDate, maxDate] values. Don't confuse this
  * method with doZoomX which accepts pixel coordinates. This function redraws
  * the graph.
@@ -1517,11 +1534,10 @@ Dygraph.prototype.doZoomXDates_ = function(minDate, maxDate) {
   var old_window = this.xAxisRange();
   var new_window = [minDate, maxDate];
   this.zoomed_x_ = true;
+
   var that = this;
   this.doAnimatedZoom(old_window, new_window, null, null, function() {
-    if (that.attr_("zoomCallback")) {
-      that.attr_("zoomCallback")(minDate, maxDate, that.yAxisRanges());
-    }
+    that.fireZoomCallback(minDate, maxDate);
   });
 };
 
@@ -1550,10 +1566,8 @@ Dygraph.prototype.doZoomY_ = function(lowY, highY) {
   this.zoomed_y_ = true;
   var that = this;
   this.doAnimatedZoom(null, null, oldValueRanges, newValueRanges, function() {
-    if (that.attr_("zoomCallback")) {
-      var xRange = that.xAxisRange();
-      that.attr_("zoomCallback")(xRange[0], xRange[1], that.yAxisRanges());
-    }
+    var xRange = that.xAxisRange();
+    that.fireZoomCallback(xRange[0], xRange[1]);
   });
 };
 
@@ -1595,9 +1609,7 @@ Dygraph.prototype.resetZoom = function() {
         }
       }
       this.drawGraph_();
-      if (this.attr_("zoomCallback")) {
-        this.attr_("zoomCallback")(minDate, maxDate, this.yAxisRanges());
-      }
+      this.fireZoomCallback(minDate, maxDate);
       return;
     }
 
@@ -1637,9 +1649,7 @@ Dygraph.prototype.resetZoom = function() {
               delete that.axes_[i].valueWindow;
             }
           }
-          if (that.attr_("zoomCallback")) {
-            that.attr_("zoomCallback")(minDate, maxDate, that.yAxisRanges());
-          }
+          this.fireZoomCallback(minDate, maxDate);
         });
   }
 };