Skip to content

Commit

Permalink
update built libs
Browse files Browse the repository at this point in the history
  • Loading branch information
dchester committed Oct 5, 2013
1 parent c9435ae commit d6c927d
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 6 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.3",
"version": "1.4.4",
"dependencies": {
"d3": "~2.10.1"
},
Expand Down
36 changes: 33 additions & 3 deletions rickshaw.js
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,14 @@ Rickshaw.Fixtures.Time = function() {
name: 'second',
seconds: 1,
formatter: function(d) { return d.getUTCSeconds() + 's' }
}, {
name: 'decisecond',
seconds: 1/10,
formatter: function(d) { return d.getUTCMilliseconds() + 'ms' }
}, {
name: 'centisecond',
seconds: 1/100,
formatter: function(d) { return d.getUTCMilliseconds() + 'ms' }
}
];

Expand Down Expand Up @@ -1024,6 +1032,14 @@ Rickshaw.Fixtures.Time.Local = function() {
name: 'second',
seconds: 1,
formatter: function(d) { return d.getSeconds() + 's' }
}, {
name: 'decisecond',
seconds: 1/10,
formatter: function(d) { return d.getMilliseconds() + 'ms' }
}, {
name: 'centisecond',
seconds: 1/100,
formatter: function(d) { return d.getMilliseconds() + 'ms' }
}
];

Expand Down Expand Up @@ -1490,7 +1506,7 @@ Rickshaw.Graph.Axis.X = function(args) {

this.render = function() {

if (this.graph.width !== this._renderWidth) this.setSize({ auto: true });
if (this._renderWidth !== undefined && this.graph.width !== this._renderWidth) this.setSize({ auto: true });

var axis = d3.svg.axis().scale(this.graph.x).orient(this.orientation);
axis.tickFormat( args.tickFormat || function(x) { return x } );
Expand Down Expand Up @@ -1619,7 +1635,7 @@ Rickshaw.Graph.Axis.Y = Rickshaw.Class.create( {

render: function() {

if (this.graph.height !== this._renderHeight) this.setSize({ auto: true });
if (this._renderHeight !== undefined && this.graph.height !== this._renderHeight) this.setSize({ auto: true });

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

Expand Down Expand Up @@ -2307,7 +2323,8 @@ Rickshaw.Graph.RangeSlider = Rickshaw.Class.create({
} );
} );

element[0].style.width = graph.width + 'px';
$(element)[0].style.width = graph.width + 'px';

},

update: function() {
Expand Down Expand Up @@ -2943,6 +2960,8 @@ Rickshaw.Graph.Renderer.Multi = Rickshaw.Class.create( Rickshaw.Graph.Renderer,
var series = group.series
.filter( function(series) { return !series.disabled } );

series.active = function() { return series };

group.renderer.render({ series: series, vis: group.vis });
series.forEach(function(s) { s.stack = s._stack || s.stack || s.data; });
});
Expand Down Expand Up @@ -3117,6 +3136,17 @@ Rickshaw.Graph.Smoother = Rickshaw.Class.create({
}
});

Rickshaw.namespace('Rickshaw.Graph.Socketio');

Rickshaw.Graph.Socketio = Rickshaw.Class.create( Rickshaw.Graph.Ajax, {
request: function() {
var socket = io.connect(this.dataURL);
thisData = this;
socket.on('rickshaw', function (data) {
thisData.success(data);
});
}
} );
Rickshaw.namespace('Rickshaw.Graph.Unstacker');

Rickshaw.Graph.Unstacker = function(args) {
Expand Down

0 comments on commit d6c927d

Please sign in to comment.