From 160d3b3e68f0fd154698ff028b3773446e7080bf Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 12 Apr 2017 17:02:50 +0200
Subject: [PATCH] lint issues
---
frontend-js/src/main/js/GuiConnector.js | 4 ----
frontend-js/src/main/js/ServerConnector.js | 8 ++++----
frontend-js/src/main/js/gui/Header.js | 2 +-
.../src/main/js/gui/leftPanel/AbstractDbPanel.js | 2 +-
.../src/main/js/gui/leftPanel/ChemicalPanel.js | 2 +-
frontend-js/src/main/js/gui/leftPanel/Footer.js | 4 ++--
.../src/main/js/gui/leftPanel/LeftPanel.js | 2 +-
.../src/main/js/gui/leftPanel/MiRnaPanel.js | 2 +-
.../src/main/js/gui/leftPanel/OverlayPanel.js | 6 +++---
frontend-js/src/main/js/gui/leftPanel/Panel.js | 2 +-
.../src/main/js/gui/leftPanel/ProjectInfoPanel.js | 15 ++++++++-------
.../js/gui/leftPanel/PublicationListDialog.js | 7 +++----
.../src/main/js/gui/leftPanel/SearchPanel.js | 3 ++-
frontend-js/src/main/js/map/CustomMap.js | 1 -
frontend-js/src/main/js/minerva.js | 11 +++++------
frontend-js/src/test/js/google-map-mock.js | 5 +++--
.../src/test/js/gui/OverviewDialog-test.js | 2 ++
.../test/js/gui/leftPanel/AbstractPanel-test.js | 4 ++--
.../src/test/js/gui/leftPanel/Footer-test.js | 8 ++++----
.../js/gui/leftPanel/ProjectInfoPanel-test.js | 2 +-
.../src/test/js/gui/leftPanel/SearchPanel-test.js | 2 +-
frontend-js/src/test/js/helper.js | 2 +-
frontend-js/src/test/js/map/CustomMap-test.js | 1 -
.../js/map/overlay/DbOverlayCollection-test.js | 3 +--
frontend-js/src/test/js/mocha-config.js | 12 ++++++------
25 files changed, 54 insertions(+), 58 deletions(-)
diff --git a/frontend-js/src/main/js/GuiConnector.js b/frontend-js/src/main/js/GuiConnector.js
index e7c261c874..203b346e23 100644
--- a/frontend-js/src/main/js/GuiConnector.js
+++ b/frontend-js/src/main/js/GuiConnector.js
@@ -2,8 +2,6 @@
var logger = require('./logger');
-var TabNavi = require('./TabNavi');
-
/**
* This static global object contains set of functions that returns/set data in
* the Gui (html).
@@ -68,8 +66,6 @@ GuiConnector.init = function() {
GuiConnector.updateMouseCoordinates(e.pageX, e.pageY);
});
});
-
-// GuiConnector.leftPanelTabNavi = new TabNavi("tabView");
};
/**
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 4e91f3e6e5..f78c485269 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -62,7 +62,7 @@ ServerConnector.updateReferenceGenomeData = function(organismId, type, version,
ServerConnector.getMinOverlayColorInt = function() {
var self = this;
- return new Promise(function(resolve, reject){
+ return new Promise(function(resolve){
var userColor;
return self.getLoggedUser().then(function(user){
userColor = user.getMinColor();
@@ -76,13 +76,13 @@ ServerConnector.getMinOverlayColorInt = function() {
/* jslint bitwise: true */
color = (color & 0xFFFFFF);
resolve(color);
- })
+ });
});
};
ServerConnector.getMaxOverlayColorInt = function() {
var self = this;
- return new Promise(function(resolve, reject){
+ return new Promise(function(resolve){
var userColor;
return self.getLoggedUser().then(function(user){
userColor = user.getMaxColor();
@@ -96,7 +96,7 @@ ServerConnector.getMaxOverlayColorInt = function() {
/* jslint bitwise: true */
color = (color & 0xFFFFFF);
resolve(color);
- })
+ });
});
};
diff --git a/frontend-js/src/main/js/gui/Header.js b/frontend-js/src/main/js/gui/Header.js
index 6a67a5495e..dc572a7166 100644
--- a/frontend-js/src/main/js/gui/Header.js
+++ b/frontend-js/src/main/js/gui/Header.js
@@ -17,7 +17,7 @@ function Header(params) {
Header.prototype = Object.create(AbstractGuiElement.prototype);
Header.prototype.constructor = Header;
-Header.prototype._createHeaderGui = function(message) {
+Header.prototype._createHeaderGui = function() {
var self = this;
var projectId = self.getMap().getProject().getProjectId();
var projectName = self.getMap().getProject().getName();
diff --git a/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js b/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js
index 795a2e5a1a..11171b1b81 100644
--- a/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js
@@ -18,7 +18,7 @@ function AbstractPanel(params) {
this._initializeGui();
this.setOverlayDb (self.getMap().getOverlayByName(params.panelName));
- this._createEventHandlers()
+ this._createEventHandlers();
this._tabIdCount = 0;
}
diff --git a/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js b/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js
index 2361f53b5d..d65363e3ce 100644
--- a/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js
@@ -53,6 +53,6 @@ ChemicalPanel.prototype.init = function() {
} else {
return Promise.resolve();
}
-}
+};
module.exports = ChemicalPanel;
diff --git a/frontend-js/src/main/js/gui/leftPanel/Footer.js b/frontend-js/src/main/js/gui/leftPanel/Footer.js
index e0cf37b711..77f30eaf9e 100644
--- a/frontend-js/src/main/js/gui/leftPanel/Footer.js
+++ b/frontend-js/src/main/js/gui/leftPanel/Footer.js
@@ -18,7 +18,7 @@ function Footer(params) {
Footer.prototype = Object.create(AbstractGuiElement.prototype);
Footer.prototype.constructor = Footer;
-Footer.prototype._createFooterGui = function(message) {
+Footer.prototype._createFooterGui = function() {
var self = this;
var projectId = self.getMap().getProject().getProjectId();
self.getElement().className = "footerLinks";
@@ -44,7 +44,7 @@ Footer.prototype._createFooterGui = function(message) {
var win = window.open(manualFileUrl, '_user_manual_');
win.focus();
});
- }
+ };
self.getElement().appendChild(link);
link = Functions.createElement({
diff --git a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js
index 3a0ed3420c..ce237fa352 100644
--- a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js
@@ -31,7 +31,7 @@ function LeftPanel(params) {
LeftPanel.prototype = Object.create(AbstractGuiElement.prototype);
LeftPanel.prototype.constructor = LeftPanel;
-LeftPanel.prototype._createPanelGui = function(message) {
+LeftPanel.prototype._createPanelGui = function() {
var self = this;
var panels = [ {
name : "SEARCH",
diff --git a/frontend-js/src/main/js/gui/leftPanel/MiRnaPanel.js b/frontend-js/src/main/js/gui/leftPanel/MiRnaPanel.js
index cdf27813b5..0db32a4f5d 100644
--- a/frontend-js/src/main/js/gui/leftPanel/MiRnaPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/MiRnaPanel.js
@@ -48,6 +48,6 @@ MiRnaPanel.prototype.init = function() {
} else {
return Promise.resolve();
}
-}
+};
module.exports = MiRnaPanel;
diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
index d59e4a93c0..7858b625bf 100644
--- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
@@ -49,9 +49,9 @@ OverlayPanel.prototype._createOverlayPanelGui = function() {
this.getElement().appendChild(customOverlaysDiv);
this.setControlElement(PanelControlElementType.OVERLAY_CUSTOM_OVERLAY_DIV, customOverlaysDiv);
- var generalOverlaysTitle = Functions.createElement({type:"h5", name:"customOverlaysTitle", content:"USER-PROVIDED OVERLAYS:"} );
- customOverlaysDiv.appendChild(generalOverlaysTitle);
- this.setControlElement(PanelControlElementType.OVERLAY_CUSTOM_OVERLAY_TITLE, generalOverlaysTitle);
+ var customOverlaysTitle = Functions.createElement({type:"h5", name:"customOverlaysTitle", content:"USER-PROVIDED OVERLAYS:"} );
+ customOverlaysDiv.appendChild(customOverlaysTitle);
+ this.setControlElement(PanelControlElementType.OVERLAY_CUSTOM_OVERLAY_TITLE, customOverlaysTitle);
var customOverlaysTableDiv = Functions.createElement({type:"table",name:"customOverlaysTab",className:"table table-bordered", style: "width:100%"});
customOverlaysDiv.appendChild(customOverlaysTableDiv);
diff --git a/frontend-js/src/main/js/gui/leftPanel/Panel.js b/frontend-js/src/main/js/gui/leftPanel/Panel.js
index 6e95863cf5..759a0ff934 100644
--- a/frontend-js/src/main/js/gui/leftPanel/Panel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/Panel.js
@@ -418,7 +418,7 @@ Panel.prototype.createTableRow = function(elements) {
row.appendChild(cell);
}
return row;
-}
+};
Panel.prototype.init = function() {
throw new Error(this.getPanelName() + " Not implemented");
diff --git a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
index 9ad72412d3..d16560a337 100644
--- a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
@@ -135,10 +135,10 @@ ProjectInfoPanel.prototype._createInfoPanelLogic = function() {
downloadSourceButton.onclick = function() {
return self.downloadSourceFile();
- }
+ };
showPublicationsButton.onclick = function() {
return self.showPublicationListDialog();
- }
+ };
};
ProjectInfoPanel.prototype.downloadSourceFile = function() {
@@ -155,10 +155,10 @@ ProjectInfoPanel.prototype.showPublicationListDialog = function() {
ProjectInfoPanel.prototype.refresh = function() {
var self = this;
- var projectNameText = this.getControlElement(PanelControlElementType.INFO_PROJECT_NAME_TEXT);
- var projectVersionText = this.getControlElement(PanelControlElementType.INFO_PROJECT_VERSION_TEXT);
- var projectDescriptionText = this.getControlElement(PanelControlElementType.INFO_PROJECT_DESCRIOPTION_TEXT);
- var projectPublicationsText = this.getControlElement(PanelControlElementType.INFO_PROJECT_PUBLICATIONS_TEXT);
+ var projectNameText = self.getControlElement(PanelControlElementType.INFO_PROJECT_NAME_TEXT);
+ var projectVersionText = self.getControlElement(PanelControlElementType.INFO_PROJECT_VERSION_TEXT);
+ var projectDescriptionText = self.getControlElement(PanelControlElementType.INFO_PROJECT_DESCRIOPTION_TEXT);
+ var projectPublicationsText = self.getControlElement(PanelControlElementType.INFO_PROJECT_PUBLICATIONS_TEXT);
return ServerConnector.getProject().then(function(project) {
projectNameText.innerHTML = project.getName();
@@ -171,5 +171,6 @@ ProjectInfoPanel.prototype.refresh = function() {
ProjectInfoPanel.prototype.init = function() {
return this.refresh();
-}
+};
+
module.exports = ProjectInfoPanel;
diff --git a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
index 714e38e902..91eb2f9568 100644
--- a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
+++ b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
@@ -6,7 +6,6 @@ var Promise = require("bluebird");
var AbstractGuiElement = require('../AbstractGuiElement');
var Alias = require('../../map/data/Alias');
-var GuiConnector = require('../../GuiConnector');
var IdentifiedElement = require('../../map/data/IdentifiedElement');
var Reaction = require('../../map/data/Reaction');
@@ -55,11 +54,11 @@ PublicationListDialog.prototype.createPublicationListDialogGui = function() {
self.getElement().appendChild(tableElement);
};
-PublicationListDialog.prototype._dataTableAjaxCall = function(data, callback, settings) {
+PublicationListDialog.prototype._dataTableAjaxCall = function(data, callback) {
var self = this;
return ServerConnector.getPublications({
start : data.start,
- length : data.length
+ length : data.length,
})
.then(
function(publicationList) {
@@ -94,7 +93,7 @@ PublicationListDialog.prototype._dataTableAjaxCall = function(data, callback, se
allElements.forEach(function(element) {
promises.push(self.getMap().getSubmodelById(element.getModelId()).getModel().getByIdentifiedElement(
element, true).then(function(elementData) {
- var name = null
+ var name = null;
if (elementData instanceof Alias) {
name = elementData.getName();
} else if (elementData instanceof Reaction) {
diff --git a/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js b/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js
index 3d81cba9a6..9108186eb4 100644
--- a/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/SearchPanel.js
@@ -174,5 +174,6 @@ SearchPanel.prototype.init = function() {
} else {
return Promise.resolve();
}
-}
+};
+
module.exports = SearchPanel;
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 81971c62f2..1d95d35dc4 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -3,7 +3,6 @@
var Promise = require("bluebird");
var logger = require('../logger');
-var functions = require('../Functions');
var AbstractCustomMap = require('./AbstractCustomMap');
var AbstractDbOverlay = require('./overlay/AbstractDbOverlay');
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 4c9a2b8798..29fbff6d7f 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -86,15 +86,15 @@ function createLegend(element) {
});
}
-function insertGoogleAnalyticsCode(customMap) {
- return new Promise(function(resolve,reject){
+function insertGoogleAnalyticsCode() {
+ return new Promise(function(resolve){
return ServerConnector.getConfigurationParam(ConfigurationType.GOOGLE_ANALYTICS_IDENTIFIER).then(function(identifier){
if (identifier === "" || identifier === undefined || identifier === null) {
resolve();
} else {
global._gaq = global._gaq || [];
- _gaq.push(['_setAccount', identifier]);
- _gaq.push(['_trackPageview']);
+ global._gaq.push(['_setAccount', identifier]);
+ global._gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
@@ -103,7 +103,7 @@ function insertGoogleAnalyticsCode(customMap) {
})();
resolve();
}
- })
+ });
});
}
@@ -171,7 +171,6 @@ function create(params) {
}
};
var hideButton = document.getElementsByName("hideButton")[0];
- var panel = document.getElementsByName("leftPanel")[0];
var icon = document.getElementsByName("hideButtonIcon")[0];
hideButton.onclick = function(){
if (icon.className.indexOf("fa-chevron-left")>=0) {
diff --git a/frontend-js/src/test/js/google-map-mock.js b/frontend-js/src/test/js/google-map-mock.js
index 23e567b811..15e220c0c0 100644
--- a/frontend-js/src/test/js/google-map-mock.js
+++ b/frontend-js/src/test/js/google-map-mock.js
@@ -262,9 +262,10 @@ var google = {
this.setMap = function(map) {
this.options.map = map;
};
- this.setOptions= function(options) {
- for (var attrname in options)
+ this.setOptions = function(options) {
+ for ( var attrname in options) {
this.options[attrname] = options[attrname];
+ }
};
},
Size : function() {
diff --git a/frontend-js/src/test/js/gui/OverviewDialog-test.js b/frontend-js/src/test/js/gui/OverviewDialog-test.js
index 3168c97275..e48ade484f 100644
--- a/frontend-js/src/test/js/gui/OverviewDialog-test.js
+++ b/frontend-js/src/test/js/gui/OverviewDialog-test.js
@@ -1,5 +1,7 @@
"use strict";
+/* exported logger,assert */
+
var Helper = require('../helper');
require("../mocha-config.js");
diff --git a/frontend-js/src/test/js/gui/leftPanel/AbstractPanel-test.js b/frontend-js/src/test/js/gui/leftPanel/AbstractPanel-test.js
index b1ce5d8489..07f8eb5d6a 100644
--- a/frontend-js/src/test/js/gui/leftPanel/AbstractPanel-test.js
+++ b/frontend-js/src/test/js/gui/leftPanel/AbstractPanel-test.js
@@ -24,7 +24,7 @@ describe('AbstractDbPanel', function() {
var div = document.createElement("div");
var map = helper.createCustomMap();
- map.registerSource(helper.createSearchDbOverlay(map))
+ map.registerSource(helper.createSearchDbOverlay(map));
var panel = new AbstractDbPanel({
element : div,
@@ -32,7 +32,7 @@ describe('AbstractDbPanel', function() {
panelName : "search",
});
- assert.ok(panel.getControlElement(PanelControlElementType.SEARCH_LABEL).innerHTML != "");
+ assert.ok(panel.getControlElement(PanelControlElementType.SEARCH_LABEL).innerHTML !== "");
});
});
diff --git a/frontend-js/src/test/js/gui/leftPanel/Footer-test.js b/frontend-js/src/test/js/gui/leftPanel/Footer-test.js
index d1345f77a1..e5ce383b9a 100644
--- a/frontend-js/src/test/js/gui/leftPanel/Footer-test.js
+++ b/frontend-js/src/test/js/gui/leftPanel/Footer-test.js
@@ -41,15 +41,15 @@ describe('Footer', function() {
var promises = [];
$("a", testDiv).each(function(index, element) {
- promises.push(new Promise(function(resolve, reject) {
+ promises.push(new Promise(function(resolve) {
var fun = element.onclick;
- if (fun) {
+ if (fun) {
resolve(fun());
} else {
resolve(null);
}
- })
- )});
+ }));
+ });
return Promise.all(promises);
});
diff --git a/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js b/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js
index 2b45a2a364..943fdbcd61 100644
--- a/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js
+++ b/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js
@@ -35,7 +35,7 @@ describe('ProjectInfoPanel', function() {
element : div,
customMap : helper.createCustomMap(),
});
- return panel.refresh().then(function(result) {
+ return panel.refresh().then(function() {
assert.ok(div.innerHTML.indexOf("UNKNOWN DISEASE MAP") >= 0);
});
});
diff --git a/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js b/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js
index 60c94261c3..9dd1b7ab37 100644
--- a/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js
+++ b/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js
@@ -66,7 +66,7 @@ describe('SearchPanel', function() {
it('search by query with no results', function() {
var map = helper.createCustomMap();
map.getModel().setId(15781);
- var searchDbOverlay = helper.createSearchDbOverlay(map);
+ helper.createSearchDbOverlay(map);
var panel = new SearchPanel({
element : testDiv,
diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js
index 06e8d145bf..130ee54cb3 100644
--- a/frontend-js/src/test/js/helper.js
+++ b/frontend-js/src/test/js/helper.js
@@ -39,7 +39,7 @@ Helper.prototype.createMenuDiv = function() {
result.appendChild(versionDiv);
var button = document.createElement("button");
- button.setAttribute("name", "hideButton")
+ button.setAttribute("name", "hideButton");
hideDiv.appendChild(button);
var icon = document.createElement("i");
diff --git a/frontend-js/src/test/js/map/CustomMap-test.js b/frontend-js/src/test/js/map/CustomMap-test.js
index 397e0b5902..c923b6fbd8 100644
--- a/frontend-js/src/test/js/map/CustomMap-test.js
+++ b/frontend-js/src/test/js/map/CustomMap-test.js
@@ -6,7 +6,6 @@ require("../mocha-config.js");
var AliasOverlay = require('../../../main/js/map/overlay/AliasOverlay');
var Comment = require('../../../main/js/map/data/Comment');
-var ControlType = require('../../../main/js/map/ControlType');
var CustomMap = require('../../../main/js/map/CustomMap');
var IdentifiedElement = require('../../../main/js/map/data/IdentifiedElement');
diff --git a/frontend-js/src/test/js/map/overlay/DbOverlayCollection-test.js b/frontend-js/src/test/js/map/overlay/DbOverlayCollection-test.js
index 7018dafce6..bd705551a8 100644
--- a/frontend-js/src/test/js/map/overlay/DbOverlayCollection-test.js
+++ b/frontend-js/src/test/js/map/overlay/DbOverlayCollection-test.js
@@ -4,7 +4,6 @@ var Helper = require('../../Helper');
var logger = require('../../logger');
-var IdentifiedElement = require('../../../../main/js/map/data/IdentifiedElement');
var DbOverlayCollection = require('../../../../main/js/map/overlay/DbOverlayCollection');
var assert = require('assert');
@@ -20,7 +19,7 @@ describe('DbOverlayCollection', function() {
new DbOverlayCollection({
map : map,
});
-
+
assert.equal(logger.getWarnings.length, 0);
});
});
diff --git a/frontend-js/src/test/js/mocha-config.js b/frontend-js/src/test/js/mocha-config.js
index 91c6b7e1d4..3be5a057ec 100644
--- a/frontend-js/src/test/js/mocha-config.js
+++ b/frontend-js/src/test/js/mocha-config.js
@@ -16,16 +16,16 @@ global.$ = require('jQuery');
global.jQuery = $;
global.window.$ = $;
-//additions to jsdom implementations:
+// additions to jsdom implementations:
global.Option = window.Option;
-window.open = function(){
+window.open = function() {
var result = {};
- result.focus = function(){
-
+ result.focus = function() {
+
};
return result;
-}
-//---
+};
+// ---
require('jquery-ui-dist/jquery-ui.js');
--
GitLab