manual merge of #1526

This commit is contained in:
Araq 2014-09-11 20:15:50 +02:00
commit 63548f04b2

View file

@ -513,7 +513,7 @@ elif defined(JS):
result.setFullYear(timeInfo.year) result.setFullYear(timeInfo.year)
result.setDate(timeInfo.monthday) result.setDate(timeInfo.monthday)
proc `$`(timeInfo: TTimeInfo): string = return $(TimeInfoToTIme(timeInfo)) proc `$`(timeInfo: TTimeInfo): string = return $(timeInfoToTime(timeInfo))
proc `$`(time: TTime): string = return $time.toLocaleString() proc `$`(time: TTime): string = return $time.toLocaleString()
proc `-` (a, b: TTime): int64 = proc `-` (a, b: TTime): int64 =