iobroker.ebus 2.4.3 → 2.5.1

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

@@ -826,8 +826,8 @@ Licensed under the MIT license.
                         var expectedPs = s.datapoints.pointsize != null ? s.datapoints.pointsize : (s.data && s.data[0] && s.data[0].length ? s.data[0].length : 3);
                         if (expectedPs > 2) {
                             format.push({
-                                x: false,
-                                y: true,
+                                x: s.bars.horizontal,
+                                y: !s.bars.horizontal,
                                 number: true,
                                 required: false,
                                 computeRange: s.yaxis.options.autoScale !== 'none',
@@ -847,8 +847,6 @@ Licensed under the MIT license.
                 ps = s.datapoints.pointsize;
                 points = s.datapoints.points;
 
-                var insertSteps = s.lines.show && s.lines.steps;
-
                 for (j = k = 0; j < data.length; ++j, k += ps) {
                     p = data[j];
 
@@ -980,8 +978,8 @@ Licensed under the MIT license.
             var eventList = eventManager[key] || [];
 
             eventList.push({"event": event, "handler": handler, "eventHolder": eventHolder, "priority": priority});
-            eventList.sort((a, b) => b.priority - a.priority );
-            eventList.forEach( eventData => {
+            eventList.sort((a, b) => b.priority - a.priority);
+            eventList.forEach(eventData => {
                 eventData.eventHolder.unbind(eventData.event, eventData.handler);
                 eventData.eventHolder.bind(eventData.event, eventData.handler);
             });
@@ -1346,8 +1344,6 @@ Licensed under the MIT license.
                     setTransformationHelpers(axis);
                     setEndpointTicks(axis, series);
 
-                    console.log('+++');
-
                     // find labelWidth/Height for axis
                     measureTickLabels(axis);
                 });
@@ -1765,7 +1761,7 @@ Licensed under the MIT license.
             }
             if (axis.options.showTickLabels === 'all') {
                 var associatedSeries = series.filter(function(s) {
-                        return s.xaxis === axis;
+                        return s.bars.horizontal ? s.yaxis === axis : s.xaxis === axis;
                     }),
                     notAllBarSeries = associatedSeries.some(function(s) {
                         return !s.bars.show;
@@ -1781,40 +1777,38 @@ Licensed under the MIT license.
             surface.clear();
             executeHooks(hooks.drawBackground, [ctx]);
 
+           
             var grid = options.grid;
-
+            
             // draw background, if any
             if (grid.show && grid.backgroundColor) {
                 drawBackground();
             }
-
+            
             if (grid.show && !grid.aboveData) {
                 drawGrid();
             }
-
+            
             for (var i = 0; i < series.length; ++i) {
                 executeHooks(hooks.drawSeries, [ctx, series[i], i, getColorOrGradient]);
                 drawSeries(series[i]);
             }
-
+            
             executeHooks(hooks.draw, [ctx]);
-
+            
             if (grid.show && grid.aboveData) {
                 drawGrid();
             }
-
+            
             surface.render();
-
+            
             // A draw implies that either the axes or data have changed, so we
             // should probably update the overlay highlights as well.
             triggerRedrawOverlay();
-
-
-           ShowTickLabels();
-
             
-        }
+            ShowTickLabels();
 
+        }
 
         //*******************************************************************
         // this is to overcome problem with colored ticks and axis labels
@@ -1930,8 +1924,6 @@ Licensed under the MIT license.
             });
         }
 
-        
-
         function extractRange(ranges, coord) {
             var axis, from, to, key, axes = allAxes();
 
@@ -2385,6 +2377,9 @@ Licensed under the MIT license.
                         });
                     },
                     drawAxisLabel = function (tick, labelBoxes) {
+
+                        console.log('drawAxisLabel called');
+
                         if (!tick || !tick.label || tick.v < axis.min || tick.v > axis.max) {
                             return nullBox;
                         }
@@ -2434,35 +2429,33 @@ Licensed under the MIT license.
                     return;
                 }
 
-                /*
-                var ctx = surface.context;
-                ctx.fillStyle = "red";
-                ctx.textAlign = "center";
-                ctx.font = "8px Arial";
-                */
                 switch (axis.options.showTickLabels) {
                     case 'none':
                         break;
                     case 'endpoints':
-                        console.log('endpoints');
+                        //*******************************************************************
+                        // this is to overcome problem with colored ticks and axis labels
+                        // xxx
+                        //*******************************************************************
                         //labelBoxes.push(drawAxisLabel(axis.ticks[0], labelBoxes));
                         //labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
                         break;
                     case 'major':
-                        console.log('major');
+                        //*******************************************************************
+                        // this is to overcome problem with colored ticks and axis labels
+                        // xxx
+                        //*******************************************************************
                         //labelBoxes.push(drawAxisLabel(axis.ticks[0], labelBoxes));
                         //labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
                         for (i = 1; i < axis.ticks.length - 1; ++i) {
                             //labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
-
-                          
-                            
-                            //ctx.fillText(axis.ticks[i].label, 10, 50); 
-
                         }
                         break;
                     case 'all':
-                        console.log('all');
+                        //*******************************************************************
+                        // this is to overcome problem with colored ticks and axis labels
+                        // xxx
+                        //*******************************************************************
                         //labelBoxes.push(drawAxisLabel(axis.ticks[0], []));
                         //labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
                         for (i = 1; i < axis.ticks.length - 1; ++i) {
@@ -2470,7 +2463,6 @@ Licensed under the MIT license.
                         }
                         break;
                 }
-                
             });
         }
 
@@ -2576,8 +2568,7 @@ Licensed under the MIT license.
                 if (series.bars.horizontal) {
                     range.ymin += delta;
                     range.ymax += delta + barWidth;
-                }
-                else {
+                } else {
                     range.xmin += delta;
                     range.xmax += delta + barWidth;
                 }
@@ -2606,7 +2597,7 @@ Licensed under the MIT license.
             }
 
             var start = series.bars.horizontal ? 1 : 0;
-            for (var j = start; j < series.datapoints.points.length; j += pointsize) {
+            for (let j = start; j < series.datapoints.points.length; j += pointsize) {
                 if (isFinite(series.datapoints.points[j]) && series.datapoints.points[j] !== null) {
                     xValues.push(series.datapoints.points[j]);
                 }
@@ -2616,10 +2607,10 @@ Licensed under the MIT license.
                 return self.indexOf(value) === index;
             }
 
-            xValues = xValues.filter( onlyUnique );
-            xValues.sort(function(a, b){return a - b});
+            xValues = xValues.filter(onlyUnique);
+            xValues.sort(function(a, b) { return a - b });
 
-            for (var j = 1; j < xValues.length; j++) {
+            for (let j = 1; j < xValues.length; j++) {
                 var distance = Math.abs(xValues[j] - xValues[j - 1]);
                 if (distance < minDistance && isFinite(distance)) {
                     minDistance = distance;
@@ -2641,21 +2632,21 @@ Licensed under the MIT license.
                 }
             }
 
-            return items.sort((a, b) => { 
+            return items.sort((a, b) => {
                 if (b.distance === undefined) {
                     return -1;
                 } else if (a.distance === undefined && b.distance !== undefined) {
                     return 1;
                 }
 
-                return a.distance - b.distance ;
+                return a.distance - b.distance;
             });
         }
 
         function findNearbyItem(mouseX, mouseY, seriesFilter, radius, computeDistance) {
             var items = findNearbyItems(mouseX, mouseY, seriesFilter, radius, computeDistance);
             return items[0] !== undefined ? items[0] : null;
-         }
+        }
 
         // returns the data item the mouse is over/ the cursor is closest to, or null if none is found
         function findItems(mouseX, mouseY, seriesFilter, radius, computeDistance) {
@@ -2689,7 +2680,7 @@ Licensed under the MIT license.
             for (i = 0; i < items.length; i++) {
                 var seriesIndex = items[i].seriesIndex;
                 var dataIndex = items[i].dataIndex;
-                var smallestDistance = items[i].distance;
+                var itemDistance = items[i].distance;
                 var ps = series[seriesIndex].datapoints.pointsize;
 
                 foundItems.push({
@@ -2697,7 +2688,7 @@ Licensed under the MIT license.
                     dataIndex: dataIndex,
                     series: series[seriesIndex],
                     seriesIndex: seriesIndex,
-                    distance: Math.sqrt(smallestDistance)
+                    distance: Math.sqrt(itemDistance)
                 });
             }
 
@@ -2780,17 +2771,19 @@ Licensed under the MIT license.
             var foundIndex = -1;
             for (var j = 0; j < points.length; j += ps) {
                 var x = points[j], y = points[j + 1];
-                if (x == null)
+                if (x == null) {
                     continue;
+                }
 
                 var bottom = ps === 3 ? points[j + 2] : defaultBottom;
                 // for a bar graph, the cursor must be inside the bar
-                if (series.bars.horizontal ?
-                    (mx <= Math.max(bottom, x) && mx >= Math.min(bottom, x) &&
-                        my >= y + barLeft && my <= y + barRight) :
-                    (mx >= x + barLeft && mx <= x + barRight &&
-                        my >= Math.min(bottom, y) && my <= Math.max(bottom, y)))
-                        foundIndex = j / ps;
+                if (series.bars.horizontal
+                    ? (mx <= Math.max(bottom, x) && mx >= Math.min(bottom, x) &&
+                        my >= y + barLeft && my <= y + barRight)
+                    : (mx >= x + barLeft && mx <= x + barRight &&
+                        my >= Math.min(bottom, y) && my <= Math.max(bottom, y))) {
+                    foundIndex = j / ps;
+                }
             }
 
             return foundIndex;

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

@@ -52,7 +52,7 @@
         var columnWidths = [];
         var style = window.getComputedStyle(document.querySelector('body'));
         for (i = 0; i < entries.length; ++i) {
-            var columnIndex = i % options.legend.noColumns;
+            let columnIndex = i % options.legend.noColumns;
             entry = entries[i];
             shape.label = entry.label;
             var info = plot.getSurface().getTextInfo('', shape.label, {
@@ -78,7 +78,7 @@
 
         // Generate html for icons and labels from a list of entries
         for (i = 0; i < entries.length; ++i) {
-            var columnIndex = i % options.legend.noColumns;
+            let columnIndex = i % options.legend.noColumns;
             entry = entries[i];
             iconHtml = '';
             shape.label = entry.label;

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

@@ -249,9 +249,9 @@ formatters and transformers to and from logarithmic representation.
                 .map(function(series) {
                     return plot.computeRangeForDataSeries(series, null, isValid);
                 }),
-            min = axis.direction === 'x' 
-            ? Math.min(0.1, range && range[0] ? range[0].xmin : 0.1) 
-            : Math.min(0.1, range && range[0] ? range[0].ymin : 0.1);
+            min = axis.direction === 'x'
+                ? Math.min(0.1, range && range[0] ? range[0].xmin : 0.1)
+                : Math.min(0.1, range && range[0] ? range[0].ymin : 0.1);
 
         axis.min = min;
 

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

@@ -38,7 +38,9 @@ The plugin supports these options:
         axisZoom: true, //zoom axis when mouse over it is allowed
         plotZoom: true, //zoom axis is allowed for plot zoom
         axisPan: true, //pan axis when mouse over it is allowed
-        plotPan: true //pan axis is allowed for plot pan
+        plotPan: true, //pan axis is allowed for plot pan
+        panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+        zoomRange: [undefined, undefined], // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
     }
 
     yaxis: {
@@ -46,6 +48,8 @@ The plugin supports these options:
         plotZoom: true, //zoom axis is allowed for plot zoom
         axisPan: true, //pan axis when mouse over it is allowed
         plotPan: true //pan axis is allowed for plot pan
+        panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+        zoomRange: [undefined, undefined], // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
     }
 ```
 **interactive** enables the built-in drag/click behaviour. If you enable
@@ -124,13 +128,17 @@ can set the default in the options.
             axisZoom: true, //zoom axis when mouse over it is allowed
             plotZoom: true, //zoom axis is allowed for plot zoom
             axisPan: true, //pan axis when mouse over it is allowed
-            plotPan: true //pan axis is allowed for plot pan
+            plotPan: true, //pan axis is allowed for plot pan
+            panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+            zoomRange: [undefined, undefined] // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
         },
         yaxis: {
             axisZoom: true,
             plotZoom: true,
             axisPan: true,
-            plotPan: true
+            plotPan: true,
+            panRange: [undefined, undefined], // no limit on pan range, or [min, max] in axis units
+            zoomRange: [undefined, undefined] // no limit on zoom range, or [closest zoom, furthest zoom] in axis units
         }
     };
 
@@ -282,10 +290,10 @@ can set the default in the options.
                 prevDragPosition.y = page.Y;
             }
         }
-        
+
         function onDrag(e) {
-            if (!isPanAction) { 
-                return; 
+            if (!isPanAction) {
+                return;
             }
 
             var page = browser.getPageXY(e);
@@ -332,8 +340,8 @@ can set the default in the options.
         }
 
         function onDragEnd(e) {
-            if (!isPanAction) { 
-                return; 
+            if (!isPanAction) {
+                return;
             }
 
             if (panTimeout) {
@@ -490,6 +498,18 @@ can set the default in the options.
                     max = tmp;
                 }
 
+                // test for zoom limits zoomRange: [min,max]
+                if (opts.zoomRange) {
+                    // zoomed in too far
+                    if (max - min < opts.zoomRange[0]) {
+                        continue;
+                    }
+                    // zoomed out to far
+                    if (max - min > opts.zoomRange[1]) {
+                        continue;
+                    }
+                }
+
                 var offsetBelow = $.plot.saturated.saturate(navigationOffset.below - (axis.min - min));
                 var offsetAbove = $.plot.saturated.saturate(navigationOffset.above - (axis.max - max));
                 opts.offset = { below: offsetBelow, above: offsetAbove };
@@ -521,6 +541,14 @@ can set the default in the options.
                     return;
                 }
 
+                // calc min delta (revealing left edge of plot)
+                var minD = axis.p2c(opts.panRange[0]) - axis.p2c(axis.min);
+                // calc max delta (revealing right edge of plot)
+                var maxD = axis.p2c(opts.panRange[1]) - axis.p2c(axis.max);
+                // limit delta to min or max if enabled
+                if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
+                if (opts.panRange[1] !== undefined && d <= minD) d = minD;
+
                 if (d !== 0) {
                     var navigationOffsetBelow = saturated.saturate(axis.c2p(axis.p2c(axis.min) + d) - axis.c2p(axis.p2c(axis.min))),
                         navigationOffsetAbove = saturated.saturate(axis.c2p(axis.p2c(axis.max) + d) - axis.c2p(axis.p2c(axis.max)));
@@ -675,6 +703,14 @@ can set the default in the options.
                     return;
                 }
 
+                // calc min delta (revealing left edge of plot)
+                var minD = p + axis.p2c(opts.panRange[0]) - axis.p2c(axisMin);
+                // calc max delta (revealing right edge of plot)
+                var maxD = p + axis.p2c(opts.panRange[1]) - axis.p2c(axisMax);
+                // limit delta to min or max if enabled
+                if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
+                if (opts.panRange[1] !== undefined && d <= minD) d = minD;
+
                 if (d !== 0) {
                     var navigationOffsetBelow = saturated.saturate(axis.c2p(axis.p2c(axisMin) - (p - d)) - axis.c2p(axis.p2c(axisMin))),
                         navigationOffsetAbove = saturated.saturate(axis.c2p(axis.p2c(axisMax) - (p - d)) - axis.c2p(axis.p2c(axisMax)));

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

@@ -20,7 +20,7 @@ can just fix the size of their placeholders.
  * Dual licensed under the MIT and GPL licenses.
  * http://benalman.com/about/license/
  */
-(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this);
+(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,window);
 
 /* eslint-enable */
 (function ($) {

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

@@ -10,6 +10,7 @@ selection: {
     color: color,
     shape: "round" or "miter" or "bevel",
     visualization: "fill" or "focus",
+    displaySelectionDecorations: true or false,
     minSize: number of pixels
 }
 
@@ -26,6 +27,10 @@ option "focus" draws a colored bezel around the selected area while keeping
 the selected area clear. The option "fill" highlights (i.e., fills) the
 selected area with a colored highlight.
 
+There are optional selection decorations (handles) that are rendered with the
+"focus" visualization option. The selection decoration is rendered by default
+but can be turned off by setting displaySelectionDecorations to false.
+
 "minSize" is the minimum size a selection can be in pixels. This value can
 be customized to determine the smallest size a selection can be and still
 have the selection rectangle be displayed. When customizing this value, the
@@ -450,6 +455,7 @@ The plugin allso adds the following methods to the plot object:
 
                 var c = $.color.parse(o.selection.color);
                 var visualization = o.selection.visualization;
+                var displaySelectionDecorations = o.selection.displaySelectionDecorations;
 
                 var scalingFactor = 1;
 
@@ -486,7 +492,10 @@ The plugin allso adds the following methods to the plot object:
                 } else {
                     ctx.fillRect(0, 0, plot.width(), plot.height());
                     ctx.clearRect(x, y, w, h);
-                    drawSelectionDecorations(ctx, x, y, w, h, oX, oY, selectionDirection(plot));
+
+                    if (displaySelectionDecorations) {
+                        drawSelectionDecorations(ctx, x, y, w, h, oX, oY, selectionDirection(plot));
+                    }
                 }
 
                 ctx.restore();
@@ -506,6 +515,7 @@ The plugin allso adds the following methods to the plot object:
             selection: {
                 mode: null, // one of null, "x", "y" or "xy"
                 visualization: "focus", // "focus" or "fill"
+                displaySelectionDecorations: true, // true or false (currently only relevant for the focus visualization)
                 color: "#888888",
                 shape: "round", // one of "round", "miter", or "bevel"
                 minSize: 5 // minimum number of pixels

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

@@ -63,8 +63,8 @@ charts or filled areas).
             }
 
             datapoints.format.push({
-                x: false,
-                y: true,
+                x: s.bars.horizontal,
+                y: !s.bars.horizontal,
                 number: true,
                 required: false,
                 computeRange: s.yaxis.options.autoScale !== 'none',
@@ -78,7 +78,7 @@ charts or filled areas).
             if (s.stack == null || s.stack === false) return;
 
             var needsBottom = s.bars.show || (s.lines.show && s.lines.fill);
-            var hasBottom = datapoints.pointsize > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y);
+            var hasBottom = datapoints.pointsize > 2 && (s.bars.horizontal ? datapoints.format[2].x : datapoints.format[2].y);
             // Series data is missing bottom points - need to format
             if (needsBottom && !hasBottom) {
                 addBottomPoints(s, datapoints);