diff --git a/frontend-js/src/main/js/GuiConnector.js b/frontend-js/src/main/js/GuiConnector.js index e7c261c874523051a0282f8fbb040803a15522ee..203b346e232d56954ec38cd1c00bfe960b24ba78 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 4e91f3e6e5fc5e55311c643b8bc715c25e52b333..f78c485269579082b2488219d407aad50a77ec37 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 6a67a5495ee19271d68b3cc7f2f2c970ab4859e6..dc572a7166742c2a3656f1584fcc4f1a85375035 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 795a2e5a1a810061d001a67f844bef39f6288dee..11171b1b81e8662d097e46e2a5fdb57c6ddfde0e 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 2361f53b5df621b72e5e3277d825322e181bf165..d65363e3ce00f99f83495a97cfc92765acc5ec48 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 e0cf37b7111884589a424f55c51da7987025aecf..77f30eaf9ef134b8a1166cc37a8679f4e926c012 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 3a0ed3420c45d2a1f170b66c7f6ce61c50f4984f..ce237fa352d73b5d18440c799bf49b33f18af9db 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 cdf27813b5e7ed090b5b191a73fc643ca4c52c91..0db32a4f5ddaa8f4da1d3e749201b22417ac8ed1 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 d59e4a93c0330ab2ca0d869798485e85060dce67..7858b625bf803745e8985a281efadaf2206c6585 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 6e95863cf570df3beac41157cf4682e158a69201..759a0ff934dd4dd4dc48b0fdad200bba4a57dc2a 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 9ad72412d393ca8739fcfbccd90b296fde3fe61d..d16560a337e30b78a7945abc6f0357fd97e8cd87 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 714e38e90240b7b0f053f78d557478a0d2ed61a1..91eb2f95680cc5c89f6d1801cd56847eccf78383 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 3d81cba9a63d4ad0f642f51d82489747cbf35e63..9108186eb4a704b2616e3e73f9095e4f8b093e8f 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 81971c62f2f17a30bac50d57a56cbaf006773d77..1d95d35dc4634660fd02c9234599244122d1c7cb 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 4c9a2b87989d20db7a12ee861aeb28055efadc01..29fbff6d7f6bec2fe2660b5c80d30acf420256e8 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 23e567b811f021b1653b68d8edb9555118d5c2f9..15e220c0c003eae331845dd9b747032aa38a9d44 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 3168c9727582f1968750b425bbe063b1077b8047..e48ade484f1b57a4a176a8f2ac4c25beb5fd1657 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 b1ce5d8489883d368a05fc9237fd5b3beb52b13d..07f8eb5d6afddc5874c17a83d9daac4a6958abd5 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 d1345f77a16aee304380ce37c5e26ee7002cc600..e5ce383b9a43ca7af8c099a10311e0ec062188b7 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 2b45a2a364cf60e808bf8538dbcbbb3347e2c9c2..943fdbcd61441b5503ab49b43817f7d25fcd1f70 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 60c94261c30e55db515b64086194b5f5acc51b92..9dd1b7ab3700211970626db16a368a6da1ccc4d6 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 06e8d145bf971645b02b7d03b321823576ca81f7..130ee54cb3430895541ca25d308d4357734cf518 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 397e0b59022c75d579da7897d1fa0787e8df4afa..c923b6fbd857b1094d5b106c4ada8766c3b412ea 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 7018dafce628002cacd320e45c87d6b60e63679f..bd705551a8d5fe59397796797a5a0890e839cda9 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 91c6b7e1d43c1591fb9adcaa8bb20b4b812937af..3be5a057ec45cdb7c80e3b2d8c45fff69ba8bcbf 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');