Merge pull request #149 from flooey/master

Three bug fixes

diff --git a/dygraph-utils.js b/dygraph-utils.js
index f5440c7..63411a5 100644 (file)
--- a/dygraph-utils.js
+++ b/dygraph-utils.js
@@ -598,7 +598,7 @@ Dygraph.updateDeep = function (self, o) {
           // DOM objects are shallowly-copied.
           self[k] = o[k];
         } else if (typeof(o[k]) == 'object') {
-          if (typeof(self[k]) != 'object') {
+          if (typeof(self[k]) != 'object' || self[k] === null) {
             self[k] = {};
           }
           Dygraph.updateDeep(self[k], o[k]);

diff --git a/plugins/legend.js b/plugins/legend.js
index 68a6762..f5f4711 100644 (file)
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@ -150,6 +150,7 @@ legend.prototype.predraw = function(e) {
   if (!this.is_generated_div_) return;
 
   // TODO(danvk): only use real APIs for this.
+  e.dygraph.graphDiv.appendChild(this.legend_div_);
   var area = e.dygraph.plotter_.area;
   this.legend_div_.style.left = area.x + area.w - e.dygraph.getOption("labelsDivWidth") - 1 + "px";
   this.legend_div_.style.top = area.y + "px";