X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=src%2Fdygraph.js;h=41e5cc15aedd041b090447ff7f82705baddd7c90;hb=50522d1b2b07c6034be6304b8efc5dd3d154e2db;hp=cb8639f5fc97e7427ef4c0b379e0c72b715a4d60;hpb=178b1e0a5023bd55b8636242623e7eb82ac12d5d;p=dygraphs.git

diff --git a/src/dygraph.js b/src/dygraph.js
index cb8639f..41e5cc1 100644
--- a/src/dygraph.js
+++ b/src/dygraph.js
@@ -51,12 +51,14 @@ import * as DygraphTickers from './dygraph-tickers';
 import * as utils from './dygraph-utils';
 import DEFAULT_ATTRS from './dygraph-default-attrs';
 import OPTIONS_REFERENCE from './dygraph-options-reference';
+import IFrameTarp from './iframe-tarp';
 
 import DefaultHandler from './datahandler/default';
 import ErrorBarsHandler from './datahandler/bars-error';
 import CustomBarsHandler from './datahandler/bars-custom';
 import DefaultFractionHandler from './datahandler/default-fractions';
 import FractionsBarsHandler from './datahandler/bars-fractions';
+import BarsHandler from './datahandler/bars';
 
 import AnnotationsPlugin from './plugins/annotations';
 import AxesPlugin from './plugins/axes';
@@ -1148,7 +1150,7 @@ Dygraph.prototype.createDragInterface_ = function() {
 
     // We cover iframes during mouse interactions. See comments in
     // dygraph-utils.js for more info on why this is a good idea.
-    tarp: new utils.IFrameTarp(),
+    tarp: new IFrameTarp(),
 
     // contextB is the same thing as this context object but renamed.
     initializeMouseDown: function(event, g, contextB) {
@@ -1772,6 +1774,8 @@ Dygraph.prototype.updateSelection_ = function(opt_animFraction) {
   if (this.getOption('highlightSeriesOpts')) {
     ctx.clearRect(0, 0, this.width_, this.height_);
     var alpha = 1.0 - this.getNumericOption('highlightSeriesBackgroundAlpha');
+    var backgroundColor = utils.toRGB_(this.getOption('highlightSeriesBackgroundColor'));
+
     if (alpha) {
       // Activating background fade includes an animation effect for a gradual
       // fade. TODO(klausw): make this independently configurable if it causes
@@ -1785,7 +1789,7 @@ Dygraph.prototype.updateSelection_ = function(opt_animFraction) {
         }
         alpha *= opt_animFraction;
       }
-      ctx.fillStyle = 'rgba(255,255,255,' + alpha + ')';
+      ctx.fillStyle = 'rgba(' + backgroundColor.r + ',' + backgroundColor.g + ',' + backgroundColor.b + ',' + alpha + ')';
       ctx.fillRect(0, 0, this.width_, this.height_);
     }
 
@@ -1811,7 +1815,7 @@ Dygraph.prototype.updateSelection_ = function(opt_animFraction) {
     ctx.save();
     for (i = 0; i < this.selPoints_.length; i++) {
       var pt = this.selPoints_[i];
-      if (!utils.isOK(pt.canvasy)) continue;
+      if (isNaN(pt.canvasy)) continue;
 
       var circleSize = this.getNumericOption('highlightCircleSize', pt.name);
       var callback = this.getFunctionOption("drawHighlightPointCallback", pt.name);
@@ -3569,10 +3573,19 @@ Dygraph.Circles = utils.Circles;
 Dygraph.Plugins = {
   Legend: LegendPlugin,
   Axes: AxesPlugin,
-  // ...
+  Annotations: AnnotationsPlugin,
+  ChartLabels: ChartLabelsPlugin,
+  Grid: GridPlugin,
+  RangeSelector: RangeSelectorPlugin
 };
+
 Dygraph.DataHandlers = {
-  DefaultHandler
+  DefaultHandler,
+  BarsHandler,
+  CustomBarsHandler,
+  DefaultFractionHandler,
+  ErrorBarsHandler,
+  FractionsBarsHandler
 };
 
 Dygraph.startPan = DygraphInteraction.startPan;
@@ -3582,4 +3595,11 @@ Dygraph.moveZoom = DygraphInteraction.moveZoom;
 Dygraph.endPan = DygraphInteraction.endPan;
 Dygraph.endZoom = DygraphInteraction.endZoom;
 
+Dygraph.numericLinearTicks = DygraphTickers.numericLinearTicks;
+Dygraph.numericTicks = DygraphTickers.numericTicks;
+Dygraph.dateTicker = DygraphTickers.dateTicker;
+Dygraph.Granularity = DygraphTickers.Granularity;
+Dygraph.getDateAxis = DygraphTickers.getDateAxis;
+Dygraph.floatFormat = utils.floatFormat;
+
 export default Dygraph;