From 1e679617ab4b41bbc9e54c7eb30e24597dbe038b Mon Sep 17 00:00:00 2001
From: Stefan Steinhart <stefan.steinhart@artec-engineering.com>
Date: Fri, 10 Jul 2015 09:32:39 +0200
Subject: [PATCH] fixed multi time format

---
 d3/d3-tests.ts | 13 +++++++++++++
 d3/d3.d.ts     |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/d3/d3-tests.ts b/d3/d3-tests.ts
index a0c2d0312..d087c7876 100644
--- a/d3/d3-tests.ts
+++ b/d3/d3-tests.ts
@@ -2677,4 +2677,17 @@ function testD3Events () {
                 console.log('shift + ' + d3.event.which);
             }
         });
+}
+
+function testD3MutlieTimeFormat() {
+    var format = d3.time.format.multi([
+        [".%L", function(d) { return d.getMilliseconds(); }],
+        [":%S", function(d) { return d.getSeconds(); }],
+        ["%I:%M", function(d) { return d.getMinutes(); }],
+        ["%I %p", function(d) { return d.getHours(); }],
+        ["%a %d", function(d) { return d.getDay() && d.getDate() != 1; }],
+        ["%b %d", function(d) { return d.getDate() != 1; }],
+        ["%B", function(d) { return d.getMonth(); }],
+        ["%Y", function() { return true; }]
+    ]);
 }
\ No newline at end of file
diff --git a/d3/d3.d.ts b/d3/d3.d.ts
index 14e2e26e5..a5b908cbe 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -1780,7 +1780,7 @@ declare module d3 {
         export function format(specifier: string): Format;
 
         export module format {
-            export function multi(formats: Array<[string, (d: Date) => boolean]>): Format;
+            export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
             export function utc(specifier: string): Format;
             export var iso: Format;
         }
@@ -2720,6 +2720,7 @@ declare module d3 {
         timeFormat: {
             (specifier: string): time.Format;
             utc(specifier: string): time.Format;
+            multi(formats: Array<[string, (d: Date) => boolean|number]>): time.Format;
         }
     }