knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #328 from markbrough/master

Browse Source 
Fix bug with dates, fixes #327 - thx to @markbrough.
This commit is contained in:
Rufus Pollock
2013-02-23 08:17:39 -08:00
parent c043aca464 9fcedc2189
commit ebc56dace7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/view.flot.js
View File

@@ -191,8 +191,8 @@ my.Flot = Backbone.View.extend({
if (typeof label !== 'string') { if (typeof label !== 'string') {
label = label.toString(); label = label.toString();
} }
if (self.state.attributes.graphType !== 'bars' && label.length > 8) { if (self.state.attributes.graphType !== 'bars' && label.length > 10) {
label = label.slice(0, 5) + "..."; label = label.slice(0, 10) + "...";
} }
return label; return label;
@@ -322,12 +322,7 @@ my.Flot = Backbone.View.extend({
var isDateTime = (xtype === 'date' || xtype === 'date-time' || xtype === 'time'); var isDateTime = (xtype === 'date' || xtype === 'date-time' || xtype === 'time');
if (isDateTime) { if (isDateTime) {
if (self.state.attributes.graphType != 'bars' &&
self.state.attributes.graphType != 'columns') {
x = new Date(x).getTime();
} else {
x = index; x = index;
}
} else if (typeof x === 'string') { } else if (typeof x === 'string') {
x = parseFloat(x); x = parseFloat(x);
if (isNaN(x)) { if (isNaN(x)) {