Add syntax check and minor fixes

diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index 6ab139eea7bf12e7c3bed1f17ac4925dd9c2f6cb..1c641da65c04dd5f32e2f1971d881b60211da460 100644 (file)
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -506,10 +506,11 @@ tvheadend.epg = function() {
 
         if (value) {
           var dt = new Date(value);
-          if (tvheadend.date_mask.length > 1){
+          if(/([%][MmsSyYdhq]+)/.test(tvheadend.date_mask)){
             return tvheadend.toCustomDate(dt,tvheadend.date_mask);
           }else{
-            return tvheadend.toCustomDate(dt,'%ddd, %MMMM %dd, %hh:%mm');
+            var options = {weekday: 'short', day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false};
+            return dt.toLocaleString(tvheadend.toLocaleFormat(), options);
           }
         }
         return "";

diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js
index fe1048a400b2adbc5491583cd3dc7847f6047b1c..e9e744fbdd992db1576f3e0586e0d7f66f280281 100644 (file)
--- a/src/webui/static/app/idnode.js
+++ b/src/webui/static/app/idnode.js
@@ -378,10 +378,11 @@ tvheadend.IdNodeField = function(conf)
             return function(v) {
                 if (v > 0) {
                     var dt = new Date(v * 1000);
-                    if (tvheadend.date_mask.length > 1){
+                    if(/([%][MmsSyYdhq]+)/.test(tvheadend.date_mask)){
                         return tvheadend.toCustomDate(dt,tvheadend.date_mask);
                     }else{
-                        return tvheadend.toCustomDate(dt,'%ddd %dd/%MM/%YYYY, %hh:%mm:%ss');
+                        var options = {weekday: 'short', day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false};
+                        return dt.toLocaleString(tvheadend.toLocaleFormat(), options);
                     }
                 }
                 return '';

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index 605065fae193fedb197ff4b0c49c6b541df85dd8..372ca14bb3e52d9c97347e85764808cf3dfcd755 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -1384,8 +1384,9 @@ tvheadend.toCustomDate = function(date, format) //author: meizz, improvements by
 
     if(/(\%ddd)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {weekday: 'short'})));
 
-    for(var k in o) if(new RegExp("("+ k +")").test(format))
-        format = format.replace(RegExp.$1, RegExp.$1.length==2 ? o[k] : ("00"+ o[k]).substr((""+ o[k]).length));
+    for(var k in o)
+        if(new RegExp("("+ k +")").test(format))
+            format = format.replace(RegExp.$1, RegExp.$1.length==2 ? o[k] : ("00"+ o[k]).substr((""+ o[k]).length));
 
     return format;
 }