From 35b99756c830ca68e84b50167be26c1d8da5bf48 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 20 Jan 2017 15:48:00 +0100
Subject: [PATCH] lint issues
---
frontend-js/src/main/js/gui/SearchPanel.js | 4 ++--
frontend-js/src/main/js/map/CustomMap.js | 3 +--
.../src/main/js/map/overlay/AbstractDbOverlay.js | 6 ++++--
.../js/map/overlay/AbstractTargettingDbOverlay.js | 4 ++--
.../src/main/js/map/overlay/ChemicalDbOverlay.js | 9 ++++-----
frontend-js/src/main/js/map/overlay/DrugDbOverlay.js | 12 +++++-------
.../src/main/js/map/overlay/MiRnaDbOverlay.js | 9 ++++-----
.../src/main/js/map/overlay/SearchDbOverlay.js | 2 ++
frontend-js/src/main/js/minerva.js | 9 ++++-----
9 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/frontend-js/src/main/js/gui/SearchPanel.js b/frontend-js/src/main/js/gui/SearchPanel.js
index bda7bab9bf..32db73606c 100644
--- a/frontend-js/src/main/js/gui/SearchPanel.js
+++ b/frontend-js/src/main/js/gui/SearchPanel.js
@@ -31,9 +31,9 @@ SearchPanel.prototype.createTableElement = function(element, icon) {
} else {
throw new Error("Unknown element type: " + element.constructor.name);
}
-}
+};
-SearchPanel.prototype.createPreamble = function(reaction) {
+SearchPanel.prototype.createPreamble = function() {
return document.createElement("div");
};
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index c8e65b08ff..a25a31f785 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -17,7 +17,6 @@ var PointMarker = require('./marker/PointMarker');
var ReactionMarker = require('./marker/ReactionMarker');
var ReactionOverlay = require('./overlay/ReactionOverlay');
var ReferenceGenome = require('./data/ReferenceGenome');
-var SearchDbCollection = require('./overlay/SearchDbOverlay');
var Submap = require('./Submap');
var TouchMap = require('./TouchMap');
@@ -439,7 +438,7 @@ CustomMap.prototype.registerSource = function(overlayCollection) {
return self.updateOverlayCollection(overlayCollection, false);
});
}
- if (overlayCollection.getName() === "drug" || overlayCollection.getName() === "chemical") {
+ if (overlayCollection.getName() === "drug" || overlayCollection.getName() === "chemical" ||overlayCollection.getName() === "mirna" ) {
overlayCollection.addListener("onSearch", function() {
return self.updateOverlayCollection(overlayCollection, false);
});
diff --git a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
index dd12068477..36d568bcda 100644
--- a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
@@ -1,5 +1,7 @@
"use strict";
+/* exported logger */
+
var logger = require('../../logger');
var Promise = require("bluebird");
@@ -119,11 +121,11 @@ AbstractDbOverlay.prototype.getQueries = function(){
return this._queries ;
};
-AbstractDbOverlay.prototype.createIdentifiedElementsForTargetingClass = function(element, colourId){
+AbstractDbOverlay.prototype.createIdentifiedElementsForTargetingClass = function(targetingElement, colourId){
var self = this;
var result =[];
var iconCounter =1;
- var targets = element.getTargets();
+ var targets = targetingElement.getTargets();
for (var k=0;k<targets.length;k++) {
var target = targets[k];
if (target.isVisible()) {
diff --git a/frontend-js/src/main/js/map/overlay/AbstractTargettingDbOverlay.js b/frontend-js/src/main/js/map/overlay/AbstractTargettingDbOverlay.js
index 138382c909..6e3c594f20 100644
--- a/frontend-js/src/main/js/map/overlay/AbstractTargettingDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/AbstractTargettingDbOverlay.js
@@ -1,5 +1,7 @@
"use strict";
+/* exported logger */
+
var logger = require('../../logger');
var Promise = require("bluebird");
@@ -7,8 +9,6 @@ var Promise = require("bluebird");
var IdentifiedElement = require('../data/IdentifiedElement');
var AbstractDbOverlay = require('./AbstractDbOverlay');
-var ServerConnector = require('../../ServerConnector');
-
function AbstractTargettingDbOverlay(params) {
// call super constructor
AbstractDbOverlay.call(this, params);
diff --git a/frontend-js/src/main/js/map/overlay/ChemicalDbOverlay.js b/frontend-js/src/main/js/map/overlay/ChemicalDbOverlay.js
index 19e3fcfa2b..778f9e8ba5 100644
--- a/frontend-js/src/main/js/map/overlay/ChemicalDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/ChemicalDbOverlay.js
@@ -1,10 +1,9 @@
"use strict";
-var logger = require('../../logger');
+/* exported logger */
-var Promise = require("bluebird");
+var logger = require('../../logger');
-var IdentifiedElement = require('../data/IdentifiedElement');
var AbstractTargettingDbOverlay = require('./AbstractTargettingDbOverlay');
var ServerConnector = require('../../ServerConnector');
@@ -22,10 +21,10 @@ ChemicalDbOverlay.prototype.constructor = ChemicalDbOverlay;
ChemicalDbOverlay.prototype.getNamesByTargetFromServer = function(param) {
return ServerConnector.getChemicalNamesByTarget(param);
-}
+};
ChemicalDbOverlay.prototype.getElementsByQueryFromServer = function(param) {
return ServerConnector.getChemicalsByQuery(param);
-}
+};
module.exports = ChemicalDbOverlay;
diff --git a/frontend-js/src/main/js/map/overlay/DrugDbOverlay.js b/frontend-js/src/main/js/map/overlay/DrugDbOverlay.js
index 0b32d3d472..bea3f1141d 100644
--- a/frontend-js/src/main/js/map/overlay/DrugDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/DrugDbOverlay.js
@@ -1,20 +1,18 @@
"use strict";
-var logger = require('../../logger');
+/* exported logger */
-var Promise = require("bluebird");
+var logger = require('../../logger');
-var IdentifiedElement = require('../data/IdentifiedElement');
var AbstractTargettingDbOverlay = require('./AbstractTargettingDbOverlay');
var ServerConnector = require('../../ServerConnector');
function DrugDbOverlay(params) {
params.iconType= "drug";
- params.iconColorStart = 5
+ params.iconColorStart = 5;
// call super constructor
AbstractTargettingDbOverlay.call(this, params);
-
}
DrugDbOverlay.prototype = Object.create(AbstractTargettingDbOverlay.prototype);
@@ -22,10 +20,10 @@ DrugDbOverlay.prototype.constructor = DrugDbOverlay;
DrugDbOverlay.prototype.getNamesByTargetFromServer = function(param) {
return ServerConnector.getDrugNamesByTarget(param);
-}
+};
DrugDbOverlay.prototype.getElementsByQueryFromServer = function(param) {
return ServerConnector.getDrugsByQuery(param);
-}
+};
module.exports = DrugDbOverlay;
diff --git a/frontend-js/src/main/js/map/overlay/MiRnaDbOverlay.js b/frontend-js/src/main/js/map/overlay/MiRnaDbOverlay.js
index 23e5d9c33f..141c864bef 100644
--- a/frontend-js/src/main/js/map/overlay/MiRnaDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/MiRnaDbOverlay.js
@@ -1,10 +1,9 @@
"use strict";
-var logger = require('../../logger');
+/* exported logger */
-var Promise = require("bluebird");
+var logger = require('../../logger');
-var IdentifiedElement = require('../data/IdentifiedElement');
var AbstractTargettingDbOverlay = require('./AbstractTargettingDbOverlay');
var ServerConnector = require('../../ServerConnector');
@@ -22,10 +21,10 @@ MiRnaDbOverlay.prototype.constructor = MiRnaDbOverlay;
MiRnaDbOverlay.prototype.getNamesByTargetFromServer = function(param) {
return ServerConnector.getMiRnaNamesByTarget(param);
-}
+};
MiRnaDbOverlay.prototype.getElementsByQueryFromServer = function(param) {
return ServerConnector.getMiRnasByQuery(param);
-}
+};
module.exports = MiRnaDbOverlay;
diff --git a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
index 32fd028dbc..992f51d797 100644
--- a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
@@ -1,5 +1,7 @@
"use strict";
+/* exported logger */
+
var logger = require('../../logger');
var Promise = require("bluebird");
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 9a951adec2..c6cd52b939 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -56,7 +56,7 @@ function restoreSearchQuery(customMap) {
} else {
return Promise.resolve();
}
-};
+}
function restoreDrugQuery(customMap) {
var query = ServerConnector.getSessionData().getDrugQuery();
@@ -65,7 +65,7 @@ function restoreDrugQuery(customMap) {
} else {
return Promise.resolve();
}
-};
+}
function restoreChemicalQuery(customMap) {
var query = ServerConnector.getSessionData().getChemicalQuery();
@@ -74,7 +74,7 @@ function restoreChemicalQuery(customMap) {
} else {
return Promise.resolve();
}
-};
+}
function restoreMiRnaQuery(customMap) {
var query = ServerConnector.getSessionData().getMiRnaQuery();
@@ -83,7 +83,7 @@ function restoreMiRnaQuery(customMap) {
} else {
return Promise.resolve();
}
-};
+}
function create(params) {
var project = params.project;
@@ -174,7 +174,6 @@ function create(params) {
return new Promise(function(resolve, reject) {
- var sessionData =ServerConnector.getSessionData();
result.refreshOverlays().then(function() {
return restoreSearchQuery(result);
}).then(function(){
--
GitLab