Code optimization

diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index 1c641da65c04dd5f32e2f1971d881b60211da460..2d14a81187993080b31174a7e21371012e7bd3f4 100644 (file)
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -506,12 +506,7 @@ tvheadend.epg = function() {
 
         if (value) {
           var dt = new Date(value);
-          if(/([%][MmsSyYdhq]+)/.test(tvheadend.date_mask)){
-            return tvheadend.toCustomDate(dt,tvheadend.date_mask);
-          }else{
-            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 tvheadend.toCustomDate(dt,tvheadend.date_mask);
         }
         return "";
     }

diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js
index e9e744fbdd992db1576f3e0586e0d7f66f280281..2d7a2e9a9864b916ed6e01ff774b8cce05168ddb 100644 (file)
--- a/src/webui/static/app/idnode.js
+++ b/src/webui/static/app/idnode.js
@@ -378,12 +378,7 @@ tvheadend.IdNodeField = function(conf)
             return function(v) {
                 if (v > 0) {
                     var dt = new Date(v * 1000);
-                    if(/([%][MmsSyYdhq]+)/.test(tvheadend.date_mask)){
-                        return tvheadend.toCustomDate(dt,tvheadend.date_mask);
-                    }else{
-                        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 tvheadend.toCustomDate(dt,tvheadend.date_mask);
                 }
                 return '';
             }

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index 372ca14bb3e52d9c97347e85764808cf3dfcd755..a0a36df01aeeac9734236b5882d533b774f77533 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -1364,31 +1364,35 @@ tvheadend.toLocaleFormat = function()
 
 tvheadend.toCustomDate = function(date, format) //author: meizz, improvements by pablozg
 {
-    var o = {
-        "\%M+" : date.getMonth()+1, //month
-        "\%d+" : date.getDate(),    //day
-        "\%h+" : date.getHours(),   //hour
-        "\%m+" : date.getMinutes(), //minute
-        "\%s+" : date.getSeconds(), //second
-        "\%q+" : Math.floor((date.getMonth()+3)/3),  //quarter
-        "\%S" : date.getMilliseconds() //millisecond
-    }
-
-    if(/(\%[yY]+)/.test(format)) format=format.replace(RegExp.$1, (date.getFullYear()+"").substr(5 - RegExp.$1.length));
+    if(/([%][MmsSyYdhq]+)/.test(format)){
+        var o = {
+            "\%M+" : date.getMonth()+1, //month
+            "\%d+" : date.getDate(),    //day
+            "\%h+" : date.getHours(),   //hour
+            "\%m+" : date.getMinutes(), //minute
+            "\%s+" : date.getSeconds(), //second
+            "\%q+" : Math.floor((date.getMonth()+3)/3),  //quarter
+            "\%S" : date.getMilliseconds() //millisecond
+        }
 
-    if(/(\%MMMM)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {month: 'long'})));
+        if(/(\%[yY]+)/.test(format)) format=format.replace(RegExp.$1, (date.getFullYear()+"").substr(5 - RegExp.$1.length));
 
-    if(/(\%MMM)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {month: 'short'})));
+        if(/(\%MMMM)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {month: 'long'})));
 
-    if(/(\%dddd)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {weekday: 'long'})));
+        if(/(\%MMM)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {month: 'short'})));
 
-    if(/(\%ddd)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {weekday: 'short'})));
+        if(/(\%dddd)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {weekday: 'long'})));
 
-    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));
+        if(/(\%ddd)/.test(format)) format=format.replace(RegExp.$1, (date.toLocaleDateString(tvheadend.toLocaleFormat(), {weekday: 'short'})));
 
-    return format;
+        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;
+    }else{
+        var options = {weekday: 'short', day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false};
+        return date.toLocaleString(tvheadend.toLocaleFormat(), options);
+    }
 }
 
 /**