summaryrefslogtreecommitdiff
path: root/www/js/utils.js
diff options
context:
space:
mode:
authorPeter Grassberger <petertheone@gmail.com>2016-01-31 16:52:43 (GMT)
committerPeter Grassberger <petertheone@gmail.com>2016-01-31 16:52:43 (GMT)
commite17fe1ce46af9990862f2e5f93064f4a9e4cbfd8 (patch)
tree061d2f949fb303e153f8e52d612b5a9cc1a8c8a6 /www/js/utils.js
parentf306d3578d0ec18e34df3b7ed30e20fa71339bf6 (diff)
musicpools: show carts/cuts, actions still missing
Diffstat (limited to 'www/js/utils.js')
-rw-r--r--www/js/utils.js23
1 files changed, 13 insertions, 10 deletions
diff --git a/www/js/utils.js b/www/js/utils.js
index 8a7ee9c..b8bfee7 100644
--- a/www/js/utils.js
+++ b/www/js/utils.js
@@ -53,17 +53,20 @@ weekday[6] = 'Samstag';
var weekday_short = new Array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa');
function format_datetime(d) {
- if(Object.prototype.toString.call(d) === '[object Date]') {
- var datetimestr = weekday_short[d.getDay()];
- datetimestr += ' ' + Number(d.getDate()).pad(2);
- datetimestr += '.' + Number(d.getMonth() + 1).pad(2);
- datetimestr += '.' + d.getFullYear();
- datetimestr += ' ' + Number(d.getHours()).pad(2);
- datetimestr += ':' + Number(d.getMinutes()).pad(2);
- datetimestr += ':' + Number(d.getSeconds()).pad(2);
- return datetimestr;
+ if(Object.prototype.toString.call(d) !== '[object Date]') {
+ return d;
}
- return d;
+ if (d.toString() === 'Invalid Date') {
+ return d;
+ }
+ var datetimestr = weekday_short[d.getDay()];
+ datetimestr += ' ' + Number(d.getDate()).pad(2);
+ datetimestr += '.' + Number(d.getMonth() + 1).pad(2);
+ datetimestr += '.' + d.getFullYear();
+ datetimestr += ' ' + Number(d.getHours()).pad(2);
+ datetimestr += ':' + Number(d.getMinutes()).pad(2);
+ datetimestr += ':' + Number(d.getSeconds()).pad(2);
+ return datetimestr;
}
function msToTimeString(time) {