projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #281 from danvk/small-files-closure
[dygraphs.git]
/
dygraph-interaction-model.js
diff --git
a/dygraph-interaction-model.js
b/dygraph-interaction-model.js
index
2af345c
..
75ee78f
100644
(file)
--- a/
dygraph-interaction-model.js
+++ b/
dygraph-interaction-model.js
@@
-42,8
+42,8
@@
Dygraph.Interaction.startPan = function(event, g, context) {
context.initialLeftmostDate = xRange[0];
context.xUnitsPerPixel = context.dateRange / (g.plotter_.area.w - 1);
context.initialLeftmostDate = xRange[0];
context.xUnitsPerPixel = context.dateRange / (g.plotter_.area.w - 1);
- if (g.
attr_
("panEdgeFraction")) {
- var maxXPixelsToDraw = g.width_ * g.
attr_
("panEdgeFraction");
+ if (g.
getNumericOption
("panEdgeFraction")) {
+ var maxXPixelsToDraw = g.width_ * g.
getNumericOption
("panEdgeFraction");
var xExtremes = g.xAxisExtremes(); // I REALLY WANT TO CALL THIS xTremes!
var boundedLeftX = g.toDomXCoord(xExtremes[0]) - maxXPixelsToDraw;
var xExtremes = g.xAxisExtremes(); // I REALLY WANT TO CALL THIS xTremes!
var boundedLeftX = g.toDomXCoord(xExtremes[0]) - maxXPixelsToDraw;
@@
-54,7
+54,7
@@
Dygraph.Interaction.startPan = function(event, g, context) {
context.boundedDates = [boundedLeftDate, boundedRightDate];
var boundedValues = [];
context.boundedDates = [boundedLeftDate, boundedRightDate];
var boundedValues = [];
- var maxYPixelsToDraw = g.height_ * g.
attr_
("panEdgeFraction");
+ var maxYPixelsToDraw = g.height_ * g.
getNumericOption
("panEdgeFraction");
for (i = 0; i < g.axes_.length; i++) {
axis = g.axes_[i];
for (i = 0; i < g.axes_.length; i++) {
axis = g.axes_[i];
@@
-115,8
+115,8
@@
Dygraph.Interaction.startPan = function(event, g, context) {
* context.
*/
Dygraph.Interaction.movePan = function(event, g, context) {
* context.
*/
Dygraph.Interaction.movePan = function(event, g, context) {
- context.dragEndX =
g
.dragGetX_(event, context);
- context.dragEndY =
g
.dragGetY_(event, context);
+ context.dragEndX =
Dygraph
.dragGetX_(event, context);
+ context.dragEndY =
Dygraph
.dragGetY_(event, context);
var minDate = context.initialLeftmostDate -
(context.dragEndX - context.dragStartX) * context.xUnitsPerPixel;
var minDate = context.initialLeftmostDate -
(context.dragEndX - context.dragStartX) * context.xUnitsPerPixel;
@@
-188,8
+188,8
@@
Dygraph.Interaction.movePan = function(event, g, context) {
* context.
*/
Dygraph.Interaction.endPan = function(event, g, context) {
* context.
*/
Dygraph.Interaction.endPan = function(event, g, context) {
- context.dragEndX =
g
.dragGetX_(event, context);
- context.dragEndY =
g
.dragGetY_(event, context);
+ context.dragEndX =
Dygraph
.dragGetX_(event, context);
+ context.dragEndY =
Dygraph
.dragGetY_(event, context);
var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
@@
-246,8
+246,8
@@
Dygraph.Interaction.startZoom = function(event, g, context) {
*/
Dygraph.Interaction.moveZoom = function(event, g, context) {
context.zoomMoved = true;
*/
Dygraph.Interaction.moveZoom = function(event, g, context) {
context.zoomMoved = true;
- context.dragEndX =
g
.dragGetX_(event, context);
- context.dragEndY =
g
.dragGetY_(event, context);
+ context.dragEndX =
Dygraph
.dragGetX_(event, context);
+ context.dragEndY =
Dygraph
.dragGetY_(event, context);
var xDelta = Math.abs(context.dragStartX - context.dragEndX);
var yDelta = Math.abs(context.dragStartY - context.dragEndY);
var xDelta = Math.abs(context.dragStartX - context.dragEndX);
var yDelta = Math.abs(context.dragStartY - context.dragEndY);
@@
-276,8
+276,8
@@
Dygraph.Interaction.moveZoom = function(event, g, context) {
* @param {Object} context
*/
Dygraph.Interaction.treatMouseOpAsClick = function(g, event, context) {
* @param {Object} context
*/
Dygraph.Interaction.treatMouseOpAsClick = function(g, event, context) {
- var clickCallback = g.
attr_
('clickCallback');
- var pointClickCallback = g.
attr_
('pointClickCallback');
+ var clickCallback = g.
getFunctionOption
('clickCallback');
+ var pointClickCallback = g.
getFunctionOption
('pointClickCallback');
var selectedPoint = null;
var selectedPoint = null;
@@
-300,7
+300,7
@@
Dygraph.Interaction.treatMouseOpAsClick = function(g, event, context) {
}
// Allow any click within two pixels of the dot.
}
// Allow any click within two pixels of the dot.
- var radius = g.
attr_
('highlightCircleSize') + 2;
+ var radius = g.
getNumericOption
('highlightCircleSize') + 2;
if (closestDistance <= radius * radius) {
selectedPoint = g.selPoints_[closestIdx];
}
if (closestDistance <= radius * radius) {
selectedPoint = g.selPoints_[closestIdx];
}
@@
-333,8
+333,8
@@
Dygraph.Interaction.treatMouseOpAsClick = function(g, event, context) {
*/
Dygraph.Interaction.endZoom = function(event, g, context) {
context.isZooming = false;
*/
Dygraph.Interaction.endZoom = function(event, g, context) {
context.isZooming = false;
- context.dragEndX =
g
.dragGetX_(event, context);
- context.dragEndY =
g
.dragGetY_(event, context);
+ context.dragEndX =
Dygraph
.dragGetX_(event, context);
+ context.dragEndY =
Dygraph
.dragGetY_(event, context);
var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
@@
-523,9
+523,9
@@
Dygraph.Interaction.moveTouch = function(event, g, context) {
g.drawGraph_(false);
// We only call zoomCallback on zooms, not pans, to mirror desktop behavior.
g.drawGraph_(false);
// We only call zoomCallback on zooms, not pans, to mirror desktop behavior.
- if (didZoom && touches.length > 1 && g.
attr_
('zoomCallback')) {
+ if (didZoom && touches.length > 1 && g.
getFunctionOption
('zoomCallback')) {
var viewWindow = g.xAxisRange();
var viewWindow = g.xAxisRange();
- g.
attr_
("zoomCallback")(viewWindow[0], viewWindow[1], g.yAxisRanges());
+ g.
getFunctionOption
("zoomCallback")(viewWindow[0], viewWindow[1], g.yAxisRanges());
}
};
}
};
@@
-645,8
+645,8
@@
Dygraph.Interaction.nonInteractiveModel_ = {
},
mouseup: function(event, g, context) {
// TODO(danvk): this logic is repeated in Dygraph.Interaction.endZoom
},
mouseup: function(event, g, context) {
// TODO(danvk): this logic is repeated in Dygraph.Interaction.endZoom
- context.dragEndX =
g
.dragGetX_(event, context);
- context.dragEndY =
g
.dragGetY_(event, context);
+ context.dragEndX =
Dygraph
.dragGetX_(event, context);
+ context.dragEndY =
Dygraph
.dragGetY_(event, context);
var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
var regionHeight = Math.abs(context.dragEndY - context.dragStartY);