iobroker.ebus 2.4.2 → 2.5.0

package/widgets/ebus/lib/js/flot/jquery.flot.time.js

@@ -26,15 +26,15 @@ API.txt for details.
     var floorInBase = $.plot.saturated.floorInBase;
 
     // Method to provide microsecond support to Date like classes.
-    var CreateMicroSecondDate = function(dateType, microEpoch) {
-        var newDate = new dateType(microEpoch);
+    var CreateMicroSecondDate = function(DateType, microEpoch) {
+        var newDate = new DateType(microEpoch);
 
         var oldSetTime = newDate.setTime.bind(newDate);
         newDate.update = function(microEpoch) {
             oldSetTime(microEpoch);
 
             // Round epoch to 3 decimal accuracy
-            microEpoch = Math.round(microEpoch*1000)/1000;
+            microEpoch = Math.round(microEpoch * 1000) / 1000;
 
             // Microseconds are stored as integers
             this.microseconds = 1000 * (microEpoch - Math.floor(microEpoch));
@@ -56,7 +56,7 @@ API.txt for details.
 
         newDate.setMicroseconds = function(microseconds) {
             var epochWithoutMicroseconds = oldGetTime();
-            var newEpoch = epochWithoutMicroseconds + microseconds/1000;
+            var newEpoch = epochWithoutMicroseconds + microseconds / 1000;
             this.update(newEpoch);
         };
 
@@ -79,29 +79,29 @@ API.txt for details.
         }
 
         var leftPad = function(n, pad) {
-			n = "" + n;
-			pad = "" + (pad == null ? "0" : pad);
-			return n.length == 1 ? pad + n : n;
-		};
+            n = "" + n;
+            pad = "" + (pad == null ? "0" : pad);
+            return n.length === 1 ? pad + n : n;
+        };
 
-		var formatSubSeconds = function(milliseconds, microseconds, numberDecimalPlaces) {
+        var formatSubSeconds = function(milliseconds, microseconds, numberDecimalPlaces) {
             var totalMicroseconds = milliseconds * 1000 + microseconds;
             var formattedString;
-			if (numberDecimalPlaces < 6 && numberDecimalPlaces > 0) {
-				var magnitude = parseFloat('1e' + (numberDecimalPlaces - 6));
-				totalMicroseconds = Math.round(Math.round(totalMicroseconds * magnitude) / magnitude);
-				formattedString = ('00000' + totalMicroseconds).slice(-6,-(6 - numberDecimalPlaces));
-			} else {
+            if (numberDecimalPlaces < 6 && numberDecimalPlaces > 0) {
+                var magnitude = parseFloat('1e' + (numberDecimalPlaces - 6));
+                totalMicroseconds = Math.round(Math.round(totalMicroseconds * magnitude) / magnitude);
+                formattedString = ('00000' + totalMicroseconds).slice(-6, -(6 - numberDecimalPlaces));
+            } else {
                 totalMicroseconds = Math.round(totalMicroseconds)
-				formattedString = ('00000' + totalMicroseconds).slice(-6);
-			}
-			return formattedString;
-		};
+                formattedString = ('00000' + totalMicroseconds).slice(-6);
+            }
+            return formattedString;
+        };
 
         var r = [];
         var escape = false;
         var hours = d.getHours();
-		var isAM = hours < 12;
+        var isAM = hours < 12;
 
         if (!monthNames) {
             monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
@@ -112,55 +112,55 @@ API.txt for details.
         }
 
         var hours12;
-		if (hours > 12) {
-			hours12 = hours - 12;
-		} else if (hours == 0) {
-			hours12 = 12;
-		} else {
-			hours12 = hours;
-		}
+        if (hours > 12) {
+            hours12 = hours - 12;
+        } else if (hours === 0) {
+            hours12 = 12;
+        } else {
+            hours12 = hours;
+        }
 
         var decimals = -1;
         for (var i = 0; i < fmt.length; ++i) {
-			var c = fmt.charAt(i);
+            var c = fmt.charAt(i);
 
             if (!isNaN(Number(c)) && Number(c) > 0) {
                 decimals = Number(c);
             } else if (escape) {
-				switch (c) {
-					case 'a': c = "" + dayNames[d.getDay()]; break;
-					case 'b': c = "" + monthNames[d.getMonth()]; break;
-					case 'd': c = leftPad(d.getDate()); break;
-					case 'e': c = leftPad(d.getDate(), " "); break;
-					case 'h':	// For back-compat with 0.7; remove in 1.0
-					case 'H': c = leftPad(hours); break;
-					case 'I': c = leftPad(hours12); break;
-					case 'l': c = leftPad(hours12, " "); break;
-					case 'm': c = leftPad(d.getMonth() + 1); break;
-					case 'M': c = leftPad(d.getMinutes()); break;
-					// quarters not in Open Group's strftime specification
-					case 'q':
-						c = "" + (Math.floor(d.getMonth() / 3) + 1); break;
-					case 'S': c = leftPad(d.getSeconds()); break;
-					case 's': c = "" + formatSubSeconds(d.getMilliseconds(), d.getMicroseconds(), decimals); break;
-					case 'y': c = leftPad(d.getFullYear() % 100); break;
-					case 'Y': c = "" + d.getFullYear(); break;
-					case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
-					case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
-					case 'w': c = "" + d.getDay(); break;
-				}
-				r.push(c);
-				escape = false;
-			} else {
-				if (c == "%") {
-					escape = true;
-				} else {
-					r.push(c);
-				}
-			}
-		}
-
-		return r.join("");
+                switch (c) {
+                    case 'a': c = "" + dayNames[d.getDay()]; break;
+                    case 'b': c = "" + monthNames[d.getMonth()]; break;
+                    case 'd': c = leftPad(d.getDate()); break;
+                    case 'e': c = leftPad(d.getDate(), " "); break;
+                    case 'h': // For back-compat with 0.7; remove in 1.0
+                    case 'H': c = leftPad(hours); break;
+                    case 'I': c = leftPad(hours12); break;
+                    case 'l': c = leftPad(hours12, " "); break;
+                    case 'm': c = leftPad(d.getMonth() + 1); break;
+                    case 'M': c = leftPad(d.getMinutes()); break;
+                    // quarters not in Open Group's strftime specification
+                    case 'q':
+                        c = "" + (Math.floor(d.getMonth() / 3) + 1); break;
+                    case 'S': c = leftPad(d.getSeconds()); break;
+                    case 's': c = "" + formatSubSeconds(d.getMilliseconds(), d.getMicroseconds(), decimals); break;
+                    case 'y': c = leftPad(d.getFullYear() % 100); break;
+                    case 'Y': c = "" + d.getFullYear(); break;
+                    case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
+                    case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
+                    case 'w': c = "" + d.getDay(); break;
+                }
+                r.push(c);
+                escape = false;
+            } else {
+                if (c === "%") {
+                    escape = true;
+                } else {
+                    r.push(c);
+                }
+            }
+        }
+
+        return r.join("");
     }
 
     // To have a consistent view of time-based data independent of which time
@@ -296,7 +296,6 @@ API.txt for details.
     var specQuarters = baseSpec.concat([[1, "quarter"], [2, "quarter"],
         [1, "year"]]);
 
-
     function dateTickGenerator(axis) {
         var opts = axis.options,
             ticks = [],
@@ -399,7 +398,7 @@ API.txt for details.
             if (step >= timeUnitSize.second) {
                 d.setMicroseconds(0);
             } else {
-                d.setMicroseconds(d.getMilliseconds()*1000);
+                d.setMicroseconds(d.getMilliseconds() * 1000);
             }
         }
         if (step >= timeUnitSize.minute) {
@@ -482,20 +481,23 @@ API.txt for details.
                 if (opts.mode === "time") {
                     axis.tickGenerator = dateTickGenerator;
 
+                    // if a tick formatter is already provided do not overwrite it
+                    if ('tickFormatter' in opts && typeof opts.tickFormatter === 'function') return;
+
                     axis.tickFormatter = function (v, axis) {
                         var d = dateGenerator(v, axis.options);
 
                         // first check global format
-						if (opts.timeformat != null) {
-							return formatDate(d, opts.timeformat, opts.monthNames, opts.dayNames);
-						}
+                        if (opts.timeformat != null) {
+                            return formatDate(d, opts.timeformat, opts.monthNames, opts.dayNames);
+                        }
 
-						// possibly use quarters if quarters are mentioned in
-						// any of these places
-						var useQuarters = (axis.options.tickSize &&
-								axis.options.tickSize[1] == "quarter") ||
-							(axis.options.minTickSize &&
-                                axis.options.minTickSize[1] == "quarter");
+                        // possibly use quarters if quarters are mentioned in
+                        // any of these places
+                        var useQuarters = (axis.options.tickSize &&
+                                axis.options.tickSize[1] === "quarter") ||
+                            (axis.options.minTickSize &&
+                                axis.options.minTickSize[1] === "quarter");
 
                         var timeUnitSize;
                         if (opts.timeBase === 'seconds') {
@@ -506,12 +508,12 @@ API.txt for details.
                             timeUnitSize = timeUnitSizeMilliseconds;
                         }
 
-						var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
-						var span = axis.max - axis.min;
-						var suffix = (opts.twelveHourClock) ? " %p" : "";
-						var hourCode = (opts.twelveHourClock) ? "%I" : "%H";
+                        var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
+                        var span = axis.max - axis.min;
+                        var suffix = (opts.twelveHourClock) ? " %p" : "";
+                        var hourCode = (opts.twelveHourClock) ? "%I" : "%H";
                         var factor;
-						var fmt;
+                        var fmt;
 
                         if (opts.timeBase === 'seconds') {
                             factor = 1;
@@ -522,45 +524,45 @@ API.txt for details.
                         }
 
                         if (t < timeUnitSize.second) {
-                            var decimals = -Math.floor(Math.log10(t/factor))
+                            var decimals = -Math.floor(Math.log10(t / factor))
 
                             // the two-and-halves require an additional decimal
                             if (String(t).indexOf('25') > -1) {
                                 decimals++;
                             }
 
-							fmt = "%S.%" + decimals + "s";
+                            fmt = "%S.%" + decimals + "s";
                         } else
                         if (t < timeUnitSize.minute) {
-							fmt = hourCode + ":%M:%S" + suffix;
-						} else if (t < timeUnitSize.day) {
-							if (span < 2 * timeUnitSize.day) {
-								fmt = hourCode + ":%M" + suffix;
-							} else {
-								fmt = "%b %d " + hourCode + ":%M" + suffix;
-							}
-						} else if (t < timeUnitSize.month) {
-							fmt = "%b %d";
-						} else if ((useQuarters && t < timeUnitSize.quarter) ||
-							(!useQuarters && t < timeUnitSize.year)) {
-							if (span < timeUnitSize.year) {
-								fmt = "%b";
-							} else {
-								fmt = "%b %Y";
-							}
-						} else if (useQuarters && t < timeUnitSize.year) {
-							if (span < timeUnitSize.year) {
-								fmt = "Q%q";
-							} else {
-								fmt = "Q%q %Y";
-							}
-						} else {
-							fmt = "%Y";
-						}
-
-						var rt = formatDate(d, fmt, opts.monthNames, opts.dayNames);
-
-						return rt;
+                            fmt = hourCode + ":%M:%S" + suffix;
+                        } else if (t < timeUnitSize.day) {
+                            if (span < 2 * timeUnitSize.day) {
+                                fmt = hourCode + ":%M" + suffix;
+                            } else {
+                                fmt = "%b %d " + hourCode + ":%M" + suffix;
+                            }
+                        } else if (t < timeUnitSize.month) {
+                            fmt = "%b %d";
+                        } else if ((useQuarters && t < timeUnitSize.quarter) ||
+                            (!useQuarters && t < timeUnitSize.year)) {
+                            if (span < timeUnitSize.year) {
+                                fmt = "%b";
+                            } else {
+                                fmt = "%b %Y";
+                            }
+                        } else if (useQuarters && t < timeUnitSize.year) {
+                            if (span < timeUnitSize.year) {
+                                fmt = "Q%q";
+                            } else {
+                                fmt = "Q%q %Y";
+                            }
+                        } else {
+                            fmt = "%Y";
+                        }
+
+                        var rt = formatDate(d, fmt, opts.monthNames, opts.dayNames);
+
+                        return rt;
                     };
                 }
             });

package/widgets/ebus/lib/js/flot/jquery.flot.touchNavigate.js

@@ -35,7 +35,7 @@
                 currentTouchedAxis: 'none',
                 touchedAxis: null,
                 navigationConstraint: 'unconstrained',
-                initialState: null,
+                initialState: null
             },
             useManualPan = options.pan.interactive && options.pan.touchMode === 'manual',
             smartPanLock = options.pan.touchMode === 'smartLock',

package/widgets/ebus.html

@@ -1277,7 +1277,7 @@
 
     // this code can be placed directly in template.html
     vis.binds.ebus = {
-        version: "2.2.4",
+        version: "2.4.4",
         showVersion: function () {
             if (vis.binds.ebus.version) {
                 console.log('Version vis-ebus: ' + vis.binds.ebus.version);
@@ -1317,130 +1317,141 @@
                 }
 
 
-    function SetMarkingColor(color) {
-        MarkingColor = color;
-    }
-    function noneFormatter(v, axis) {
-        return v.toFixed(axis.tickDecimals);
-    }
-
-    function degreeFormatter(v, axis) {
-        return v.toFixed(axis.tickDecimals) + "°C";
-    }
+                function SetMarkingColor(color) {
+                    MarkingColor = color;
+                }
+                function noneFormatter(v, axis) {
+                    return v.toFixed(axis.tickDecimals);
+                }
 
-    function xwhFormatter(val, axis) {
-        if (val > 1000000)
-            return (val / 1000000).toFixed(axis.tickDecimals) + " MWh";
-        else if (val > 1000)
-            return (val / 1000).toFixed(axis.tickDecimals) + " kWh";
-        else
-            return val.toFixed(axis.tickDecimals) + " Wh";
-    }
-    function xwFormatter(val, axis) {
-        if (val > 1000000)
-            return (val / 1000000).toFixed(axis.tickDecimals) + " MW";
-        else if (val > 1000)
-            return (val / 1000).toFixed(axis.tickDecimals) + " kW";
-        else
-            return val.toFixed(axis.tickDecimals) + " W";
-    }
+                function degreeFormatter(v, axis) {
+                    return v.toFixed(axis.tickDecimals) + "°C";
+                }
 
-    function legendformater(label, series) {
+                function xwhFormatter(val, axis) {
+                    if (val > 1000000)
+                        return (val / 1000000).toFixed(axis.tickDecimals) + " MWh";
+                    else if (val > 1000)
+                        return (val / 1000).toFixed(axis.tickDecimals) + " kWh";
+                    else
+                        return val.toFixed(axis.tickDecimals) + " Wh";
+                }
+                function xwFormatter(val, axis) {
+                    if (val > 1000000)
+                        return (val / 1000000).toFixed(axis.tickDecimals) + " MW";
+                    else if (val > 1000)
+                        return (val / 1000).toFixed(axis.tickDecimals) + " kW";
+                    else
+                        return val.toFixed(axis.tickDecimals) + " W";
+                }
 
-        //wenn keine Daten, dann ausblenden ->  (return null)
-        if (series.data == null || typeof series.data == "undefined" || typeof series.data[0] == "undefined") {
+                function legendformater(label, series) {
 
-            console.log('legendformater no label because no data ');
-            return null;
-        }
-        else {
-            console.log('legendformater label ' + label);
-            return label;
-        }
-    }
+                    //wenn keine Daten, dann ausblenden ->  (return null)
+                    if (series.data == null || typeof series.data == "undefined" || typeof series.data[0] == "undefined") {
 
-    function GridMarkings(axes) {
+                        console.log('legendformater no label because no data ');
+                        return null;
+                    }
+                    else {
+                        console.log('legendformater label ' + label);
+                        return label;
+                    }
+                }
 
-        var markings = [];
-        var minDate = new Date(axes.xaxis.min);
+                function GridMarkings(axes) {
 
-        const dayDiff = (axes.xaxis.max - axes.xaxis.min) / 1000 / 60 / 60 / 24;
-        console.log('GridMarkings: DayDiff ' + dayDiff + ' (' + axes.xaxis.max + ' ' + axes.xaxis.min + ')');
+                    var markings = [];
+                    var minDate = new Date(axes.xaxis.min);
 
-        var i = minDate.getTime();
+                    const dayDiff = (axes.xaxis.max - axes.xaxis.min) / 1000 / 60 / 60 / 24;
+                    console.log('GridMarkings: DayDiff ' + dayDiff + ' (' + axes.xaxis.max + ' ' + axes.xaxis.min + ')');
 
-        //if we only few hours then we need markings per hour otherwise per day
-        if (dayDiff > 2) {
-            do {
-                markings.push({ xaxis: { from: i, to: i + 24 * 60 * 60 * 1000 }, color: MarkingColor });
-                i += 2 * 24 * 60 * 60 * 1000;
-            } while (i < axes.xaxis.max);
+                    var i = minDate.getTime();
 
-        }
-        else {
-            do {
-                markings.push({ xaxis: { from: i, to: i + 60 * 60 * 1000 }, color: MarkingColor });
-                i += 2 * 60 * 60 * 1000;
-            } while (i < axes.xaxis.max);
-        }
-        return markings;
+                    let limit = 0;
+                    //if we only few hours then we need markings per hour otherwise per day
+                    if (dayDiff > 2) {
+                        do {
+                            markings.push({ xaxis: { from: i, to: i + 24 * 60 * 60 * 1000 }, color: MarkingColor });
+                            i += 2 * 24 * 60 * 60 * 1000;
+                            limit++;
+                        } while (i < axes.xaxis.max || limit > 200);
 
-    }
+                    }
+                    else {
+                        do {
+                            markings.push({ xaxis: { from: i, to: i + 60 * 60 * 1000 }, color: MarkingColor });
+                            i += 2 * 60 * 60 * 1000;
+                            limit++;
+                        } while (i < axes.xaxis.max || limit>200);
+                    }
+                    return markings;
 
-    function CalcTicks4X(axis) {
+                }
 
-        var ticks = [];
+                function CalcTicks4X(axis) {
 
-        var minDate = new Date(axis.min);
+                    var ticks = [];
 
-        const dayDiff = (axis.max - axis.min) / 1000 / 60 / 60 / 24;
+                    var minDate = new Date(axis.min);
 
-        console.log('CalcTicks4X: DayDiff ' + dayDiff + ' (' + axis.max + ' ' + axis.min + ')');
+                    const dayDiff = (axis.max - axis.min) / 1000 / 60 / 60 / 24;
 
-        //if we only few hours then we need markings per hour otherwise per day
-        if (dayDiff > 2) {
-            minDate.setHours(12);
-            minDate.setMinutes(0);
-            var i = minDate.getTime();
-            do {
-                ticks.push([i]);
-                i += 24 * 60 * 60 * 1000;
-            } while (i < axis.max);
-        }
-        else {
-            minDate.setHours(0);
-            minDate.setMinutes(0);
-            var i = minDate.getTime();
-            do {
-                ticks.push([i]);
-                i += 6 * 60 * 60 * 1000;
-            } while (i < axis.max);
-        }
-        return ticks;
-    }
+                    console.log('CalcTicks4X: DayDiff ' + dayDiff + ' (' + axis.max + ' ' + axis.min + ')');
 
+                    let limit = 0;
+                    //if we only few hours then we need markings per hour otherwise per day
+                    if (dayDiff > 2) {
+                        minDate.setHours(12);
+                        minDate.setMinutes(0);
+                        var i = minDate.getTime();
+                        do {
+                            ticks.push([i]);
+                            i += 24 * 60 * 60 * 1000;
+                            limit++;
+                        } while (i < axis.max || limit>200);
+                    }
+                    else {
+                        minDate.setHours(0);
+                        minDate.setMinutes(0);
+                        var i = minDate.getTime();
+                        do {
+                            ticks.push([i]);
+                            i += 6 * 60 * 60 * 1000;
+                            limit++;
+                        } while (i < axis.max || limit>200);
+                    }
+                    return ticks;
+                }
 
 
 
 
 
+                //should avoid endles loops
+                let UpdateRetryCounter = 0;
 
 
 
 
                 function update() {
 
-                    console.log("ShowChart ebus  (" + widgetID + ")");
+                    console.log("ShowChart ebus  (" + widgetID + ") retry counter " + UpdateRetryCounter);
 
                     var $div = $('#' + widgetID);
                     // if nothing found => wait
                     if (!$div.length) {
                         return setTimeout(function () {
                             console.log("need to wait... (" + widgetID + ")");
-                            update();
+                            if (UpdateRetryCounter < 5) {
+                                UpdateRetryCounter++;
+                                update();
+                            }
                         }, 1000);
                     }
 
+                    UpdateRetryCounter = 0;
                     console.log("ShowChart ebus begin (" + widgetID + ")");
 
                     if (!data || !data.ebusinstance) {
@@ -1571,7 +1582,7 @@
                                     var names = Object.keys(sVal[0]);
                                     var sValGraph1 = sVal[0][names[0]];
                                     //console.log("graph1 " + sDate + " " + sTime + ": " + sValGraph1);
-                                    console.log("graph1 " + oDate.toISOString() + " " + sValGraph1);
+                                    //console.log("graph1 " + oDate.toISOString() + " " + sValGraph1);
                                     values_graph1.push([oDate, sValGraph1]);
 
                                     if (sValGraph1 > maxY_graph[0]) maxY_graph[0] = sValGraph1;
@@ -1591,7 +1602,7 @@
                                     var names = Object.keys(sVal[0]);
                                     var sValGraph2 = sVal[0][names[0]];
                                     //console.log("graph2 " + sDate + " " + sTime + ": " + sValGraph2);
-                                    console.log("graph2 " + oDate.toISOString() + " " + sValGraph2);
+                                    //console.log("graph2 " + oDate.toISOString() + " " + sValGraph2);
                                     values_graph2.push([oDate, sValGraph2]);
 
                                     if (sValGraph2 > maxY_graph[1]) maxY_graph[1] = sValGraph2;
@@ -1610,7 +1621,7 @@
                                     var names = Object.keys(sVal[0]);
                                     var sValGraph3 = sVal[0][names[0]];
                                     //console.log("graph3 " + sDate + " " + sTime + ": " + sValGraph3);
-                                    console.log("graph3 " + oDate.toISOString() + " " + sValGraph3);
+                                    //console.log("graph3 " + oDate.toISOString() + " " + sValGraph3);
                                     values_graph3.push([oDate, sValGraph3]);
 
                                     if (sValGraph3 > maxY_graph[2]) maxY_graph[2] = sValGraph3;
@@ -1629,7 +1640,7 @@
                                     var names = Object.keys(sVal[0]);
                                     var sValGraph4 = sVal[0][names[0]];
                                     //console.log("graph4 " + sDate + " " + sTime + ": " + sValGraph4);
-                                    console.log("graph4 " + oDate.toISOString() + " " + sValGraph4);
+                                    //console.log("graph4 " + oDate.toISOString() + " " + sValGraph4);
                                     values_graph4.push([oDate, sValGraph4]);
 
                                     if (sValGraph4 > maxY_graph[3]) maxY_graph[3] = sValGraph4;
@@ -1655,7 +1666,7 @@
 
                         for (var n = 0; n < 4; n++) {
 
-                            console.log("****** before Graph" + n + " max " + maxY_graph[n] + " min " + minY_graph[n]);
+                            //console.log("****** before Graph" + n + " max " + maxY_graph[n] + " min " + minY_graph[n]);
 
                             var nTemp = parseFloat(maxY_graph[n]);
                             //console.log(nTemp);
@@ -1682,7 +1693,7 @@
                                 //console.log(nTemp);
                                 minY_graph[n] = Math.ceil(nTemp) * 10;
                             }
-                            console.log("****** after Graph" + n + "max " + maxY_graph[n] + " min " + minY_graph[n]);
+                            //console.log("****** after Graph" + n + "max " + maxY_graph[n] + " min " + minY_graph[n]);
                         }
 
                         var barwidth = 1000 * 60 * 5; //5 Minuten
@@ -2023,7 +2034,7 @@
 
                                     // backgroundColor: data.nobgcolor ? null : { colors: ["#fff", "#eee"] },
                                     backgroundColor: data.nobgcolor ? null : data.bgcolor,
-                                    borderWidth:  parseFloat(data.borderWidth), //data.withborder,
+                                    borderWidth: parseFloat(data.borderWidth), //data.withborder,
                                     borderColor: data.bordercolor,
                                     margin: 1,
                                     /*
@@ -2088,7 +2099,7 @@
 
                         $div.data('timer', setInterval(function () {
                             update();
-                        }, parseInt(vis.binds.ebus.setup.intervals[data.time_interval] , 10)));
+                        }, parseInt(vis.binds.ebus.setup.intervals[data.time_interval], 10)));
                     }
 
                 }