Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-14 08:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix undefined check

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-07-28 21:26:44 +02:00
parent 9b40364e5e
commit f8724eb040
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Chart/ChartAbstract.js
View File

@ -247,7 +247,7 @@
{ {
let self = this; let self = this;
if (this.legend !== undefined && this.legend.visible) { if (typeof this.legend !== 'undefined' && this.legend.visible) {
dataPointEnter.append("text").attr('class', 'dataPoint-name'); dataPointEnter.append("text").attr('class', 'dataPoint-name');
dataPoint.select("text.dataPoint-name").attr("x", dataPoint.select("text.dataPoint-name").attr("x",
this.dimension.width this.dimension.width
@ -340,7 +340,7 @@
let temp, pos = 0, topmargin = 0; let temp, pos = 0, topmargin = 0;
/* No subtitle without title */ /* No subtitle without title */
if (this.subtitle !== undefined && this.subtitle.text !== '' && this.subtitle.visible && this.title !== undefined && this.title.text !== '' && this.title.visible) { if (typeof this.subtitle !== 'undefined' && this.subtitle.text !== '' && this.subtitle.visible && typeof this.title !== 'undefined' && this.title.text !== '' && this.title.visible) {
pos = this.calculateHorizontalPosition(this.subtitle.position); pos = this.calculateHorizontalPosition(this.subtitle.position);
temp = svg.append("text") temp = svg.append("text")
@ -361,7 +361,7 @@
} }
} }
if (this.title !== undefined && this.title.text !== '' && this.title.visible) { if (typeof this.title !== 'undefined' && this.title.text !== '' && this.title.visible) {
pos = this.calculateHorizontalPosition(this.title.position); pos = this.calculateHorizontalPosition(this.title.position);
temp = svg.append("text") temp = svg.append("text")
@ -379,7 +379,7 @@
} }
} }
if (this.footer !== undefined && this.footer.text !== '' && this.footer.visible) { if (typeof this.footer !== 'undefined' && this.footer.text !== '' && this.footer.visible) {
let spacer = 0; let spacer = 0;
// if no x axis available an element less will be drawn and the footer // if no x axis available an element less will be drawn and the footer
@ -424,7 +424,7 @@
- this.margin.bottom - this.margin.bottom
); );
if (this.axis.x !== undefined && this.axis.x.visible) { if (typeof this.axis.x !== 'undefined' && this.axis.x.visible) {
temp = svg.append("g") temp = svg.append("g")
.attr("class", "x axis") .attr("class", "x axis")
.attr("transform", "translate(0," + ( .attr("transform", "translate(0," + (
@ -451,7 +451,7 @@
} }
} }
if (this.axis.y !== undefined && this.axis.y.visible) { if (typeof this.axis.y !== 'undefined' && this.axis.y.visible) {
temp = svg.append("g") temp = svg.append("g")
.attr("class", "y axis") .attr("class", "y axis")
.attr("transform", "translate(0,0)") .attr("transform", "translate(0,0)")
@ -475,25 +475,25 @@
} }
} }
if (this.axis.x2 !== undefined) { if (typeof this.axis.x2 !== 'undefined') {
} }
if (this.axis.y2 !== undefined) { if (typeof this.axis.y2 !== 'undefined') {
} }
}; };
jsOMS.Chart.ChartAbstract.prototype.drawGrid = function (svg, xGrid, yGrid) jsOMS.Chart.ChartAbstract.prototype.drawGrid = function (svg, xGrid, yGrid)
{ {
if (this.grid.x !== undefined && this.grid.x.visible) { if (typeof this.grid.x !== 'undefined' && this.grid.x.visible) {
svg.append("g") svg.append("g")
.attr("class", "x grid") .attr("class", "x grid")
.attr("transform", "translate(0," + (this.dimension.height - this.margin.top - this.margin.bottom) + ")") .attr("transform", "translate(0," + (this.dimension.height - this.margin.top - this.margin.bottom) + ")")
.call(xGrid); .call(xGrid);
} }
if (this.grid.y !== undefined && this.grid.y.visible) { if (typeof this.grid.y !== 'undefined' && this.grid.y.visible) {
svg.append("g") svg.append("g")
.attr("class", "y grid") .attr("class", "y grid")
.call(yGrid); .call(yGrid);

2
Module/ModuleManager.js
View File

@ -37,7 +37,7 @@
*/ */
jsOMS.Module.ModuleManager.prototype.get = function (module) jsOMS.Module.ModuleManager.prototype.get = function (module)
{ {
if (this.modules[module] === undefined) { if (typeof this.modules[module] === 'undefined') {
this.modules[module] = jsOMS.Module.ModuleFactory.getInstance(module, this.app); this.modules[module] = jsOMS.Module.ModuleFactory.getInstance(module, this.app);
} }

2
Utils/oLib.js
View File

@ -117,7 +117,7 @@
*/ */
jsOMS.hasClass = function (ele, cls) jsOMS.hasClass = function (ele, cls)
{ {
return ele !== undefined && ele !== null && ele.className !== undefined && ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')); return typeof ele !== 'undefined' && ele !== null && typeof ele.className !== 'undefined' && ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'));
}; };
/** /**