Adding upstream version 1.12.1.upstream/1.12.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 55 insertions, 51 deletions

diff --git a/web/gui/dashboard.js b/web/gui/dashboard.js
index 8fea6254..7ba8c522 100644
--- a/web/gui/dashboard.js
+++ b/web/gui/dashboard.js
@@ -2930,6 +2930,9 @@ NETDATA.sparklineChartCreate = function (state, data) {
 };
 // google charts
 
+// Codacy declarations
+/* global google */
+
 NETDATA.googleInitialize = function (callback) {
     if (typeof netdataNoGoogleCharts === 'undefined' || !netdataNoGoogleCharts) {
         $.ajax({
@@ -4988,6 +4991,7 @@ NETDATA.commonColors = {
 
 // Codacy declarations
 /* global clipboard */
+/* global Ps */
 
 if (NETDATA.options.debug.main_loop) {
     console.log('welcome to NETDATA');
@@ -6256,6 +6260,55 @@ let chartState = function (element) {
         this.tm.last_dom_created = 0;
     };
 
+    const maxMessageFontSize = () => {
+        let screenHeight = screen.height;
+        let el = this.element;
+
+        // normally we want a font size, as tall as the element
+        let h = el.clientHeight;
+
+        // but give it some air, 20% let's say, or 5 pixels min
+        let lost = Math.max(h * 0.2, 5);
+        h -= lost;
+
+        // center the text, vertically
+        let paddingTop = (lost - 5) / 2;
+
+        // but check the width too
+        // it should fit 10 characters in it
+        let w = el.clientWidth / 10;
+        if (h > w) {
+            paddingTop += (h - w) / 2;
+            h = w;
+        }
+
+        // and don't make it too huge
+        // 5% of the screen size is good
+        if (h > screenHeight / 20) {
+            paddingTop += (h - (screenHeight / 20)) / 2;
+            h = screenHeight / 20;
+        }
+
+        // set it
+        this.element_message.style.fontSize = h.toString() + 'px';
+        this.element_message.style.paddingTop = paddingTop.toString() + 'px';
+    };
+
+    const showMessageIcon = (icon) => {
+        this.element_message.innerHTML = icon;
+        maxMessageFontSize();
+        $(this.element_message).removeClass('hidden');
+        this.tmp.___messageHidden___ = undefined;
+    };
+
+    const showLoading = () => {
+        if (!this.chart_created) {
+            showMessageIcon(NETDATA.icons.loading + ' netdata');
+            return true;
+        }
+        return false;
+    };
+
     let createDOM = () => {
         if (!this.enabled) {
             return;
@@ -6329,47 +6382,6 @@ let chartState = function (element) {
         }
     };
 
-    const maxMessageFontSize = () => {
-        let screenHeight = screen.height;
-        let el = this.element;
-
-        // normally we want a font size, as tall as the element
-        let h = el.clientHeight;
-
-        // but give it some air, 20% let's say, or 5 pixels min
-        let lost = Math.max(h * 0.2, 5);
-        h -= lost;
-
-        // center the text, vertically
-        let paddingTop = (lost - 5) / 2;
-
-        // but check the width too
-        // it should fit 10 characters in it
-        let w = el.clientWidth / 10;
-        if (h > w) {
-            paddingTop += (h - w) / 2;
-            h = w;
-        }
-
-        // and don't make it too huge
-        // 5% of the screen size is good
-        if (h > screenHeight / 20) {
-            paddingTop += (h - (screenHeight / 20)) / 2;
-            h = screenHeight / 20;
-        }
-
-        // set it
-        this.element_message.style.fontSize = h.toString() + 'px';
-        this.element_message.style.paddingTop = paddingTop.toString() + 'px';
-    };
-
-    const showMessageIcon = (icon) => {
-        this.element_message.innerHTML = icon;
-        maxMessageFontSize();
-        $(this.element_message).removeClass('hidden');
-        this.tmp.___messageHidden___ = undefined;
-    };
-
     const hideMessage = () => {
         if (typeof this.tmp.___messageHidden___ === 'undefined') {
             this.tmp.___messageHidden___ = true;
@@ -6393,14 +6405,6 @@ let chartState = function (element) {
         showMessageIcon(icon + ' netdata' + invisibleSearchableText());
     };
 
-    const showLoading = () => {
-        if (!this.chart_created) {
-            showMessageIcon(NETDATA.icons.loading + ' netdata');
-            return true;
-        }
-        return false;
-    };
-
     const isHidden = () => {
         return (typeof this.tmp.___chartIsHidden___ !== 'undefined');
     };
@@ -8828,7 +8832,7 @@ NETDATA.resetAllCharts = function (state) {
     // if (NETDATA.globalPanAndZoom.isMaster(state) === false) {
     //     master = false;
     // }
-    const master = NETDATA.globalPanAndZoom.isMaster(state)
+    const master = NETDATA.globalPanAndZoom.isMaster(state);
 
     // clear the global Pan and Zoom
     // this will also refresh the master
@@ -9758,7 +9762,7 @@ NETDATA.registry = {
         NETDATA.registry.hello(NETDATA.serverDefault, function (data) {
             if (data) {
                 NETDATA.registry.server = data.registry;
-                if (data.cloud_base_url != "") {
+                if (data.cloud_base_url !== "") {
                     NETDATA.registry.isCloudEnabled = true;
                     NETDATA.registry.cloudBaseURL = data.cloud_base_url;
                 } else {