iobroker.ebus 3.0.0 → 3.0.3

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

@@ -144,10 +144,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     };
 
     function init(plot) {
-        plot.hooks.processOptions.push(function (plot, options) {
-
-            console.log('??????? ');
-
+        plot.hooks.processOptions.push(function(plot, options) {
             if (!options.axisLabels.show) {
                 return;
             }

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

@@ -45,6 +45,8 @@ the tooltip from webcharts).
         var lastMouseMoveEvent;
         var highlights = [];
 
+        console.log("hover init");
+
         function bindEvents(plot, eventHolder) {
             var o = plot.getOptions();
 

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

@@ -99,6 +99,8 @@ Licensed under the MIT license.
         // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
         // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
 
+        console.log("xxx Plot started...");
+
         var series = [],
             options = {
                 // the color theme used for graphs
@@ -380,6 +382,8 @@ Licensed under the MIT license.
                 Canvas: Canvas
             };
 
+            console.log("init plugins " + plugins.length);
+
             for (var i = 0; i < plugins.length; ++i) {
                 var p = plugins[i];
                 p.init(plot, classes);
@@ -1520,7 +1524,7 @@ Licensed under the MIT license.
             var magn = parseFloat('1e' + (-dec)),
                 norm = delta / magn;
 
-            if (norm > 2.25 && norm < 3 && (dec + 1) <= tickDecimals) {
+            if (norm > 2.25 && norm < 3 && (tickDecimals == null || (dec + 1) <= tickDecimals)) {
                 //we need an extra decimals when tickSize is 2.5
                 ++dec;
             }
@@ -1777,37 +1781,35 @@ 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();
         }
 
         //*******************************************************************
@@ -2447,9 +2449,9 @@ Licensed under the MIT license.
                         //*******************************************************************
                         //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));
-                        }
+                        //for (i = 1; i < axis.ticks.length - 1; ++i) {
+                        //    labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
+                        //}
                         break;
                     case 'all':
                         //*******************************************************************
@@ -2458,9 +2460,9 @@ Licensed under the MIT license.
                         //*******************************************************************
                         //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) {
-                            //labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
-                        }
+                        //for (i = 1; i < axis.ticks.length - 1; ++i) {
+                        //    labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
+                        //}
                         break;
                 }
             });

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

@@ -31,11 +31,11 @@ API.txt for details.
 
         var oldSetTime = newDate.setTime.bind(newDate);
         newDate.update = function(microEpoch) {
-            oldSetTime(microEpoch);
-
             // Round epoch to 3 decimal accuracy
             microEpoch = Math.round(microEpoch * 1000) / 1000;
 
+            oldSetTime(microEpoch);
+
             // Microseconds are stored as integers
             this.microseconds = 1000 * (microEpoch - Math.floor(microEpoch));
         };
@@ -395,11 +395,10 @@ API.txt for details.
         // reset smaller components
 
         if (step >= timeUnitSize.millisecond) {
-            if (step >= timeUnitSize.second) {
-                d.setMicroseconds(0);
-            } else {
-                d.setMicroseconds(d.getMilliseconds() * 1000);
-            }
+            d.setMicroseconds(0);
+        }
+        if (step >= timeUnitSize.second) {
+            d.setMilliseconds(0);
         }
         if (step >= timeUnitSize.minute) {
             d.setSeconds(0);

package/widgets/ebus/lib/js/lib/globalize.culture.en-US.js

@@ -0,0 +1,33 @@
+/*
+ * Globalize Culture en-US
+ *
+ * http://github.com/jquery/globalize
+ *
+ * Copyright Software Freedom Conservancy, Inc.
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * This file was generated by the Globalize Culture Generator
+ * Translation: bugs found in this file need to be fixed in the generator
+ */
+
+(function( window, undefined ) {
+
+var Globalize;
+
+if ( typeof require !== "undefined" &&
+	typeof exports !== "undefined" &&
+	typeof module !== "undefined" ) {
+	// Assume CommonJS
+	Globalize = require( "globalize" );
+} else {
+	// Global variable
+	Globalize = window.Globalize;
+}
+
+Globalize.addCultureInfo( "en-US", "default", {
+	name: "en-US",
+	englishName: "English (United States)"
+});
+
+}( this ));