datalib
Advanced tools
Comparing version 1.4.10 to 1.4.11
{ | ||
"name": "datalib", | ||
"version": "1.4.10", | ||
"version": "1.4.11", | ||
"description": "JavaScript utilites for loading, summarizing and working with data.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -5,3 +5,5 @@ var d3_time = require('d3-time'), | ||
numberF = d3_numberF, // defaults to EN-US | ||
timeF = d3_timeF; // defaults to EN-US | ||
timeF = d3_timeF, // defaults to EN-US | ||
tmpDate = new Date(2000, 0, 1), | ||
monthFull, monthAbbr, dayFull, dayAbbr; | ||
@@ -18,2 +20,3 @@ function numberLocale(l) { | ||
timeF = f; | ||
monthFull = monthAbbr = dayFull = dayAbbr = null; | ||
} | ||
@@ -42,3 +45,6 @@ | ||
utc: function() { return utcAutoFormat(); } | ||
} | ||
}, | ||
month: monthFormat, // format month name from integer code | ||
day: dayFormat // format week day name from integer code | ||
}; | ||
@@ -164,1 +170,15 @@ | ||
} | ||
function monthFormat(month, abbreviate) { | ||
var f = abbreviate ? | ||
(monthAbbr || (monthAbbr = timeF.format('%b'))) : | ||
(monthFull || (monthFull = timeF.format('%B'))); | ||
return (tmpDate.setMonth(month), f(tmpDate)); | ||
} | ||
function dayFormat(day, abbreviate) { | ||
var f = abbreviate ? | ||
(dayAbbr || (dayAbbr = timeF.format('%a'))) : | ||
(dayFull || (dayFull = timeF.format('%A'))); | ||
return (tmpDate.setMonth(0), tmpDate.setDate(2 + day), f(tmpDate)); | ||
} |
@@ -8,3 +8,5 @@ var util = require('./util'), | ||
truncate: util.truncate, | ||
pad: util.pad | ||
pad: util.pad, | ||
day: format.day, | ||
month: format.month | ||
}; | ||
@@ -173,2 +175,14 @@ | ||
break; | ||
case 'month': | ||
src = 'this.month(' + src + ')'; | ||
break; | ||
case 'month-abbrev': | ||
src = 'this.month(' + src + ',true)'; | ||
break; | ||
case 'day': | ||
src = 'this.day(' + src + ')'; | ||
break; | ||
case 'day-abbrev': | ||
src = 'this.day(' + src + ',true)'; | ||
break; | ||
default: | ||
@@ -175,0 +189,0 @@ throw Error('Unrecognized template filter: ' + f); |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
486156
7552