diff --git a/frontend-js/src/main/js/gui/SearchPanel.js b/frontend-js/src/main/js/gui/SearchPanel.js index bda7bab9bf048ed9603a54ac2e54d5d240356116..32db73606c9811d727892524b03e1cd975ede8b5 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 c8e65b08ffef247f40aeaebe959ccee57a7fd27f..a25a31f785da6d33cafcbacdec2df0a888b829b1 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 dd120684776315939e9e022464c5a9965d7bfcb5..36d568bcda2a942f7a7d9f37edb3e97b7136f9ae 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 138382c909b8601038cdb53e808c927362a0524c..6e3c594f204539fba64e5c86f7e8ab35ca4edddb 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 19e3fcfa2bf8f68bd413f31c1646a59b9113a9db..778f9e8ba5e6af9dbce4ebb2f10911950da63f6d 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 0b32d3d47239d0a6e88bfa3b8ae6bd2208f65111..bea3f1141d94da8cc26102deb6b39a014a056d64 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 23e5d9c33f6e193f66b315bbd2e2bea7807c0fd8..141c864befe0525ddd21de0fcd8fbc0050febb46 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 32fd028dbcd73dd69aa8f7eae9f8b6ac6ef6ac48..992f51d797f6606288e36c823b1ba29681ae5a17 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 9a951adec2f235e823e68da1e0cd0bb8bda377d3..c6cd52b9394ba0651043109f7fb06b7728d179e4 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(){