Skip to content

Commit

Permalink
Codacy js fixes (netdata#5337)
Browse files Browse the repository at this point in the history 
* Ignore main.js which will be deprecated and fix some warnings in dashboard

* Minor fixes to resolve codacy issues in dashboard.js.
  • Loading branch information
@cakrit @kiku-jw
cakrit authored and kiku-jw committed Mar 4, 2019
1 parent a34be61 commit 05af103
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 102 deletions.
1 change: 1 addition & 0 deletions .codacy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ exclude_paths:
- web/gui/lib/**
- web/gui/old/**
- web/gui/src/**
- web/gui/main.js
- tests/**
106 changes: 55 additions & 51 deletions web/gui/dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -4988,6 +4991,7 @@ NETDATA.commonColors = {

// Codacy declarations
/* global clipboard */
/* global Ps */

if (NETDATA.options.debug.main_loop) {
console.log('welcome to NETDATA');
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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');
};
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions web/gui/src/dashboard.js/charting/google-charts.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// google charts

// Codacy declarations
/* global google */

NETDATA.googleInitialize = function (callback) {
if (typeof netdataNoGoogleCharts === 'undefined' || !netdataNoGoogleCharts) {
$.ajax({
Expand Down
101 changes: 51 additions & 50 deletions web/gui/src/dashboard.js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

// Codacy declarations
/* global clipboard */
/* global Ps */

if (NETDATA.options.debug.main_loop) {
console.log('welcome to NETDATA');
Expand Down Expand Up @@ -1271,6 +1272,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;
Expand Down Expand Up @@ -1344,47 +1394,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;
Expand All @@ -1408,14 +1417,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');
};
Expand Down Expand Up @@ -3843,7 +3844,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
Expand Down
2 changes: 1 addition & 1 deletion web/gui/src/dashboard.js/registry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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 {
Expand Down

0 comments on commit 05af103

Please sign in to comment.