mirror of
https://github.com/morrisjs/morris.js.git
synced 2024-11-10 21:36:34 +01:00
Compile js
This commit is contained in:
parent
7d46e6e903
commit
14d45161b4
85
morris.js
85
morris.js
@ -89,16 +89,32 @@
|
|||||||
this.elementWidth = null;
|
this.elementWidth = null;
|
||||||
this.elementHeight = null;
|
this.elementHeight = null;
|
||||||
this.dirty = false;
|
this.dirty = false;
|
||||||
|
this.selectFrom = null;
|
||||||
if (this.init) {
|
if (this.init) {
|
||||||
this.init();
|
this.init();
|
||||||
}
|
}
|
||||||
this.setData(this.options.data);
|
this.setData(this.options.data);
|
||||||
this.el.bind('mousemove', function(evt) {
|
this.el.bind('mousemove', function(evt) {
|
||||||
var offset;
|
var left, offset, right, width, x;
|
||||||
offset = _this.el.offset();
|
offset = _this.el.offset();
|
||||||
return _this.fire('hovermove', evt.pageX - offset.left, evt.pageY - offset.top);
|
x = evt.pageX - offset.left;
|
||||||
|
if (_this.selectFrom) {
|
||||||
|
left = _this.data[_this.hitTest(Math.min(x, _this.selectFrom))]._x;
|
||||||
|
right = _this.data[_this.hitTest(Math.max(x, _this.selectFrom))]._x;
|
||||||
|
width = right - left;
|
||||||
|
return _this.selectionRect.attr({
|
||||||
|
x: left,
|
||||||
|
width: width
|
||||||
});
|
});
|
||||||
this.el.bind('mouseout', function(evt) {
|
} else {
|
||||||
|
return _this.fire('hovermove', x, evt.pageY - offset.top);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.el.bind('mouseleave', function(evt) {
|
||||||
|
if (_this.selectFrom) {
|
||||||
|
_this.selectionRect.hide();
|
||||||
|
_this.selectFrom = null;
|
||||||
|
}
|
||||||
return _this.fire('hoverout');
|
return _this.fire('hoverout');
|
||||||
});
|
});
|
||||||
this.el.bind('touchstart touchmove touchend', function(evt) {
|
this.el.bind('touchstart touchmove touchend', function(evt) {
|
||||||
@ -113,6 +129,23 @@
|
|||||||
offset = _this.el.offset();
|
offset = _this.el.offset();
|
||||||
return _this.fire('gridclick', evt.pageX - offset.left, evt.pageY - offset.top);
|
return _this.fire('gridclick', evt.pageX - offset.left, evt.pageY - offset.top);
|
||||||
});
|
});
|
||||||
|
if (this.options.rangeSelect) {
|
||||||
|
this.selectionRect = this.raphael.rect(0, 0, 0, this.el.innerHeight()).attr({
|
||||||
|
fill: this.options.rangeSelectColor,
|
||||||
|
stroke: false
|
||||||
|
}).toBack().hide();
|
||||||
|
this.el.bind('mousedown', function(evt) {
|
||||||
|
var offset;
|
||||||
|
offset = _this.el.offset();
|
||||||
|
return _this.startRange(evt.pageX - offset.left);
|
||||||
|
});
|
||||||
|
this.el.bind('mouseup', function(evt) {
|
||||||
|
var offset;
|
||||||
|
offset = _this.el.offset();
|
||||||
|
_this.endRange(evt.pageX - offset.left);
|
||||||
|
return _this.fire('hovermove', evt.pageX - offset.left, evt.pageY - offset.top);
|
||||||
|
});
|
||||||
|
}
|
||||||
if (this.postInit) {
|
if (this.postInit) {
|
||||||
this.postInit();
|
this.postInit();
|
||||||
}
|
}
|
||||||
@ -143,7 +176,9 @@
|
|||||||
goalLineColors: ['#666633', '#999966', '#cc6666', '#663333'],
|
goalLineColors: ['#666633', '#999966', '#cc6666', '#663333'],
|
||||||
events: [],
|
events: [],
|
||||||
eventStrokeWidth: 1.0,
|
eventStrokeWidth: 1.0,
|
||||||
eventLineColors: ['#005a04', '#ccffbb', '#3a5f0b', '#005502']
|
eventLineColors: ['#005a04', '#ccffbb', '#3a5f0b', '#005502'],
|
||||||
|
rangeSelect: null,
|
||||||
|
rangeSelectColor: '#eef'
|
||||||
};
|
};
|
||||||
|
|
||||||
Grid.prototype.setData = function(data, redraw) {
|
Grid.prototype.setData = function(data, redraw) {
|
||||||
@ -438,14 +473,6 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Grid.prototype.updateHover = function(x, y) {
|
|
||||||
var hit, _ref;
|
|
||||||
hit = this.hitTest(x, y);
|
|
||||||
if (hit != null) {
|
|
||||||
return (_ref = this.hover).update.apply(_ref, hit);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Grid.prototype.drawGrid = function() {
|
Grid.prototype.drawGrid = function() {
|
||||||
var lineY, y, _i, _len, _ref, _results;
|
var lineY, y, _i, _len, _ref, _results;
|
||||||
if (this.options.grid === false && this.options.axes === false) {
|
if (this.options.grid === false && this.options.axes === false) {
|
||||||
@ -508,6 +535,28 @@
|
|||||||
return this.raphael.path(path).attr('stroke', this.options.gridLineColor).attr('stroke-width', this.options.gridStrokeWidth);
|
return this.raphael.path(path).attr('stroke', this.options.gridLineColor).attr('stroke-width', this.options.gridStrokeWidth);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Grid.prototype.startRange = function(x) {
|
||||||
|
this.hover.hide();
|
||||||
|
this.selectFrom = x;
|
||||||
|
return this.selectionRect.attr({
|
||||||
|
x: x,
|
||||||
|
width: 0
|
||||||
|
}).show();
|
||||||
|
};
|
||||||
|
|
||||||
|
Grid.prototype.endRange = function(x) {
|
||||||
|
var end, start;
|
||||||
|
if (this.selectFrom) {
|
||||||
|
start = Math.min(this.selectFrom, x);
|
||||||
|
end = Math.max(this.selectFrom, x);
|
||||||
|
this.options.rangeSelect.call(this.el, {
|
||||||
|
start: this.data[this.hitTest(start)].x,
|
||||||
|
end: this.data[this.hitTest(end)].x
|
||||||
|
});
|
||||||
|
return this.selectFrom = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return Grid;
|
return Grid;
|
||||||
|
|
||||||
})(Morris.EventEmitter);
|
})(Morris.EventEmitter);
|
||||||
@ -723,7 +772,7 @@
|
|||||||
return _results;
|
return _results;
|
||||||
};
|
};
|
||||||
|
|
||||||
Line.prototype.hitTest = function(x, y) {
|
Line.prototype.hitTest = function(x) {
|
||||||
var index, r, _i, _len, _ref;
|
var index, r, _i, _len, _ref;
|
||||||
if (this.data.length === 0) {
|
if (this.data.length === 0) {
|
||||||
return null;
|
return null;
|
||||||
@ -740,13 +789,13 @@
|
|||||||
|
|
||||||
Line.prototype.onGridClick = function(x, y) {
|
Line.prototype.onGridClick = function(x, y) {
|
||||||
var index;
|
var index;
|
||||||
index = this.hitTest(x, y);
|
index = this.hitTest(x);
|
||||||
return this.fire('click', index, this.options.data[index], x, y);
|
return this.fire('click', index, this.options.data[index], x, y);
|
||||||
};
|
};
|
||||||
|
|
||||||
Line.prototype.onHoverMove = function(x, y) {
|
Line.prototype.onHoverMove = function(x, y) {
|
||||||
var index;
|
var index;
|
||||||
index = this.hitTest(x, y);
|
index = this.hitTest(x);
|
||||||
return this.displayHoverForRow(index);
|
return this.displayHoverForRow(index);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1453,7 +1502,7 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Bar.prototype.hitTest = function(x, y) {
|
Bar.prototype.hitTest = function(x) {
|
||||||
if (this.data.length === 0) {
|
if (this.data.length === 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@ -1463,13 +1512,13 @@
|
|||||||
|
|
||||||
Bar.prototype.onGridClick = function(x, y) {
|
Bar.prototype.onGridClick = function(x, y) {
|
||||||
var index;
|
var index;
|
||||||
index = this.hitTest(x, y);
|
index = this.hitTest(x);
|
||||||
return this.fire('click', index, this.options.data[index], x, y);
|
return this.fire('click', index, this.options.data[index], x, y);
|
||||||
};
|
};
|
||||||
|
|
||||||
Bar.prototype.onHoverMove = function(x, y) {
|
Bar.prototype.onHoverMove = function(x, y) {
|
||||||
var index, _ref;
|
var index, _ref;
|
||||||
index = this.hitTest(x, y);
|
index = this.hitTest(x);
|
||||||
return (_ref = this.hover).update.apply(_ref, this.hoverContentForRow(index));
|
return (_ref = this.hover).update.apply(_ref, this.hoverContentForRow(index));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
2
morris.min.js
vendored
2
morris.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user