Skip to content

Commit

Permalink
update built libs
Browse files Browse the repository at this point in the history
  • Loading branch information
dchester committed Aug 9, 2013
1 parent a7f7acb commit 2c499d4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rickshaw",
"version": "1.4.1",
"version": "1.4.2",
"dependencies": {
"d3": "~2.10.1"
},
Expand Down
6 changes: 5 additions & 1 deletion rickshaw.js
Original file line number Diff line number Diff line change
Expand Up @@ -1445,6 +1445,7 @@ Rickshaw.Graph.Axis.X = function(args) {

this.pixelsPerTick = args.pixelsPerTick || 75;
if (args.ticks) this.staticTicks = args.ticks;
if (args.tickValues) this.tickValues = args.tickValues;

this.tickSize = args.tickSize || 4;
this.ticksTreatment = args.ticksTreatment || 'plain';
Expand Down Expand Up @@ -1493,6 +1494,7 @@ Rickshaw.Graph.Axis.X = function(args) {

var axis = d3.svg.axis().scale(this.graph.x).orient(this.orientation);
axis.tickFormat( args.tickFormat || function(x) { return x } );
if (this.tickValues) axis.tickValues(this.tickValues);

this.ticks = this.staticTicks || Math.floor(this.graph.width / this.pixelsPerTick);

Expand Down Expand Up @@ -1556,6 +1558,7 @@ Rickshaw.Graph.Axis.Y = Rickshaw.Class.create( {

this.pixelsPerTick = args.pixelsPerTick || 75;
if (args.ticks) this.staticTicks = args.ticks;
if (args.tickValues) this.tickValues = args.tickValues;

this.tickSize = args.tickSize || 4;
this.ticksTreatment = args.ticksTreatment || 'plain';
Expand Down Expand Up @@ -1630,6 +1633,7 @@ Rickshaw.Graph.Axis.Y = Rickshaw.Class.create( {
_drawAxis: function(scale) {
var axis = d3.svg.axis().scale(scale).orient(this.orientation);
axis.tickFormat(this.tickFormat);
if (this.tickValues) axis.tickValues(this.tickValues);

if (this.orientation == 'left') {
var berth = this.height * this.berthRate;
Expand Down Expand Up @@ -3344,7 +3348,7 @@ Rickshaw.Series.FixedDuration = Rickshaw.Class.create(Rickshaw.Series, {

// zero-fill up to maxDataPoints size if we don't have that much data yet
if ((typeof(this.maxDataPoints) !== 'undefined') && (this.currentSize < this.maxDataPoints)) {
for (var i = this.maxDataPoints - this.currentSize - 1; i > 0; i--) {
for (var i = this.maxDataPoints - this.currentSize - 1; i > 1; i--) {
this.currentSize += 1;
this.currentIndex += 1;
this.forEach( function (item) {
Expand Down
Loading

0 comments on commit 2c499d4

Please sign in to comment.