projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turn on more lint warnings; clear up some directives
[dygraphs.git]
/
dygraph.js
diff --git
a/dygraph.js
b/dygraph.js
index
a87695a
..
348ef6c
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-47,7
+47,6
@@
if (typeof(DEBUG) === 'undefined') DEBUG=true;
var Dygraph = (function() {
if (typeof(DEBUG) === 'undefined') DEBUG=true;
var Dygraph = (function() {
-/*jshint globalstrict: true */
/*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false,ActiveXObject:false */
"use strict";
/*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false,ActiveXObject:false */
"use strict";
@@
-118,10
+117,8
@@
Dygraph.KMG2_SMALL_LABELS = [ 'm', 'u', 'n', 'p', 'f', 'a', 'z', 'y' ];
* and maxNumberWidth options.
* @param {number} x The number to be formatted
* @param {Dygraph} opts An options view
* and maxNumberWidth options.
* @param {number} x The number to be formatted
* @param {Dygraph} opts An options view
- * @param {string} name The name of the point's data series
- * @param {Dygraph} g The dygraph object
*/
*/
-Dygraph.numberValueFormatter = function(x, opts
, pt, g
) {
+Dygraph.numberValueFormatter = function(x, opts) {
var sigFigs = opts('sigFigs');
if (sigFigs !== null) {
var sigFigs = opts('sigFigs');
if (sigFigs !== null) {
@@
-192,8
+189,8
@@
Dygraph.numberValueFormatter = function(x, opts, pt, g) {
* variant for use as an axisLabelFormatter.
* @private
*/
* variant for use as an axisLabelFormatter.
* @private
*/
-Dygraph.numberAxisLabelFormatter = function(x, granularity, opts
, g
) {
- return Dygraph.numberValueFormatter(x, opts
, g
);
+Dygraph.numberAxisLabelFormatter = function(x, granularity, opts) {
+ return Dygraph.numberValueFormatter(x, opts);
};
/**
};
/**
@@
-555,6
+552,7
@@
Dygraph.prototype.__init__ = function(div, file, attrs) {
var handlers = pluginInstance.activate(this);
for (var eventName in handlers) {
var handlers = pluginInstance.activate(this);
for (var eventName in handlers) {
+ if (!handlers.hasOwnProperty(eventName)) continue;
// TODO(danvk): validate eventName.
pluginDict.events[eventName] = handlers[eventName];
}
// TODO(danvk): validate eventName.
pluginDict.events[eventName] = handlers[eventName];
}
@@
-1079,7
+1077,7
@@
Dygraph.prototype.toPercentXCoord = function(x) {
var xRange = this.xAxisRange();
var pct;
var logscale = this.attributes_.getForAxis("logscale", 'x') ;
var xRange = this.xAxisRange();
var pct;
var logscale = this.attributes_.getForAxis("logscale", 'x') ;
- if (logscale ==
true) {
// logscale can be null so we test for true explicitly.
+ if (logscale ==
= true) {
// logscale can be null so we test for true explicitly.
var logr0 = Dygraph.log10(xRange[0]);
var logr1 = Dygraph.log10(xRange[1]);
pct = (Dygraph.log10(x) - logr0) / (logr1 - logr0);
var logr0 = Dygraph.log10(xRange[0]);
var logr1 = Dygraph.log10(xRange[1]);
pct = (Dygraph.log10(x) - logr0) / (logr1 - logr0);
@@
-1603,7
+1601,7
@@
Dygraph.prototype.drawZoomRect_ = function(direction, startX, endX, startY,
*/
Dygraph.prototype.clearZoomRect_ = function() {
this.currentZoomRectArgs_ = null;
*/
Dygraph.prototype.clearZoomRect_ = function() {
this.currentZoomRectArgs_ = null;
- this.canvas_ctx_.clearRect(0, 0, this.
canvas_.width, this.canvas_.height
);
+ this.canvas_ctx_.clearRect(0, 0, this.
width_, this.height_
);
};
/**
};
/**
@@
-2725,8
+2723,7
@@
Dygraph.prototype.renderGraph_ = function(is_initial_draw) {
// TODO(danvk): is this a performance bottleneck when panning?
// The interaction canvas should already be empty in that situation.
// TODO(danvk): is this a performance bottleneck when panning?
// The interaction canvas should already be empty in that situation.
- this.canvas_.getContext('2d').clearRect(0, 0, this.canvas_.width,
- this.canvas_.height);
+ this.canvas_.getContext('2d').clearRect(0, 0, this.width_, this.height_);
if (this.getFunctionOption("drawCallback") !== null) {
this.getFunctionOption("drawCallback")(this, is_initial_draw);
if (this.getFunctionOption("drawCallback") !== null) {
this.getFunctionOption("drawCallback")(this, is_initial_draw);
@@
-3556,6
+3553,7
@@
Dygraph.prototype.updateOptions = function(input_attrs, block_redraw) {
Dygraph.mapLegacyOptions_ = function(attrs) {
var my_attrs = {};
for (var k in attrs) {
Dygraph.mapLegacyOptions_ = function(attrs) {
var my_attrs = {};
for (var k in attrs) {
+ if (!attrs.hasOwnProperty(k)) continue;
if (k == 'file') continue;
if (attrs.hasOwnProperty(k)) my_attrs[k] = attrs[k];
}
if (k == 'file') continue;
if (attrs.hasOwnProperty(k)) my_attrs[k] = attrs[k];
}