diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 9632fe0df19851af672b8e81c0410fec4498926a..482d054f657ad9e868b135687d54eb4e4fd9a691 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -1,5 +1,7 @@
"use strict";
+/* exported logger */
+
var Promise = require("bluebird");
var logger = require('./logger');
diff --git a/frontend-js/src/main/js/gui/ContextMenu.js b/frontend-js/src/main/js/gui/ContextMenu.js
index 9bf21d940a44fd285bd5eb763ec9eeb8ebe131c7..c45f45e80b007f0be4085871d3fa00c1079d94b3 100644
--- a/frontend-js/src/main/js/gui/ContextMenu.js
+++ b/frontend-js/src/main/js/gui/ContextMenu.js
@@ -81,67 +81,63 @@ ContextMenu.prototype.hide = function() {
ContextMenu.prototype.createExportAsImageSubmenu = function() {
var self = this;
- return new Promise(function(resolve, reject){
- return ServerConnector.getImageConverters().then(function(converters){
- var li = Functions.createElement({
- type : "li"
- });
- var submenu = new SubMenu({
- element : li,
- name : "Export as image",
- customMap : self.getMap()
- });
-
- var map = self.getMap();
- converters.forEach(function(converter){
- submenu.addOption(converter.name, function(){
- return ServerConnector.getImageDownloadUrl({
- polygonString: map.getSelectedPolygon(),
- modelId: map.getActiveSubmapId(),
- handlerClass: converter.handler,
- backgroundOverlayId: map.getGoogleMap().getMapTypeId(),
- zoomLevel:map. getGoogleMap().getZoom(),
- overlayIds: map.getSelectedLayouts(),
- }).then(function(url){
- return self.downloadFile(url);
- }).catch(GuiConnector.alert);
- });
+ return ServerConnector.getImageConverters().then(function(converters){
+ var li = Functions.createElement({
+ type : "li"
+ });
+ var submenu = new SubMenu({
+ element : li,
+ name : "Export as image",
+ customMap : self.getMap()
+ });
+
+ var map = self.getMap();
+ converters.forEach(function(converter){
+ submenu.addOption(converter.name, function(){
+ return ServerConnector.getImageDownloadUrl({
+ polygonString: map.getSelectedPolygon(),
+ modelId: map.getActiveSubmapId(),
+ handlerClass: converter.handler,
+ backgroundOverlayId: map.getGoogleMap().getMapTypeId(),
+ zoomLevel:map. getGoogleMap().getZoom(),
+ overlayIds: map.getSelectedLayouts(),
+ }).then(function(url){
+ return self.downloadFile(url);
+ }).catch(GuiConnector.alert);
});
- resolve(submenu);
});
+ return submenu;
});
};
ContextMenu.prototype.createExportAsModelSubmenu = function() {
var self = this;
- return new Promise(function(resolve, reject){
- return ServerConnector.getModelConverters().then(function(converters){
- var li = Functions.createElement({
- type : "li"
- });
- var submenu = new SubMenu({
- element : li,
- name : "Export as model",
- customMap : self.getMap()
- });
-
- var map = self.getMap();
- converters.forEach(function(converter){
- submenu.addOption(converter.name, function(){
- return ServerConnector.getModelDownloadUrl({
- polygonString: map.getSelectedPolygon(),
- modelId: map.getActiveSubmapId(),
- handlerClass: converter.handler,
- backgroundOverlayId: map.getGoogleMap().getMapTypeId(),
- zoomLevel:map. getGoogleMap().getZoom(),
- overlayIds: map.getSelectedLayouts(),
- }).then(function(url){
- return self.downloadFile(url);
- }).catch(GuiConnector.alert);
- });
+ return ServerConnector.getModelConverters().then(function(converters){
+ var li = Functions.createElement({
+ type : "li"
+ });
+ var submenu = new SubMenu({
+ element : li,
+ name : "Export as model",
+ customMap : self.getMap()
+ });
+
+ var map = self.getMap();
+ converters.forEach(function(converter){
+ submenu.addOption(converter.name, function(){
+ return ServerConnector.getModelDownloadUrl({
+ polygonString: map.getSelectedPolygon(),
+ modelId: map.getActiveSubmapId(),
+ handlerClass: converter.handler,
+ backgroundOverlayId: map.getGoogleMap().getMapTypeId(),
+ zoomLevel:map. getGoogleMap().getZoom(),
+ overlayIds: map.getSelectedLayouts(),
+ }).then(function(url){
+ return self.downloadFile(url);
+ }).catch(GuiConnector.alert);
});
- resolve(submenu);
});
+ return submenu;
});
};
diff --git a/frontend-js/src/main/js/gui/MapContextMenu.js b/frontend-js/src/main/js/gui/MapContextMenu.js
index 180add589917109e69c06900d3b764c080efeb48..5fc7af7586742fb788b76ea384dc56f327dd2d9c 100644
--- a/frontend-js/src/main/js/gui/MapContextMenu.js
+++ b/frontend-js/src/main/js/gui/MapContextMenu.js
@@ -3,7 +3,6 @@
/* exported logger */
var ContextMenu = require('./ContextMenu');
-var SubMenu = require('./SubMenu');
var logger = require('../logger');
@@ -32,7 +31,7 @@ MapContextMenu.prototype.init = function() {
var self = this;
return self.createExportAsImageSubmenu().then(function(submenu){
self.addOption(submenu);
- return self.createExportAsModelSubmenu()
+ return self.createExportAsModelSubmenu();
}).then(function(submenu){
self.addOption(submenu);
});
diff --git a/frontend-js/src/main/js/gui/SelectionContextMenu.js b/frontend-js/src/main/js/gui/SelectionContextMenu.js
index 2eeb5641e6cdfec9045e0297c8e82a8b44e6829f..8af409642f530d32203ec481d3e3ef3d981c31e4 100644
--- a/frontend-js/src/main/js/gui/SelectionContextMenu.js
+++ b/frontend-js/src/main/js/gui/SelectionContextMenu.js
@@ -3,8 +3,6 @@
/* exported logger */
var ContextMenu = require('./ContextMenu');
-var SubMenu = require('./SubMenu');
-var Functions = require('../Functions');
var logger = require('../logger');
@@ -22,7 +20,7 @@ SelectionContextMenu.prototype.init = function() {
var self = this;
return self.createExportAsImageSubmenu().then(function(submenu){
self.addOption(submenu);
- return self.createExportAsModelSubmenu()
+ return self.createExportAsModelSubmenu();
}).then(function(submenu){
self.addOption(submenu);
});
diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index fde28e3eacc78ca45a55b9cb9ad5320041b603aa..1472ae606a6d08f551ca3822967729b2c506a4a7 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -653,7 +653,7 @@ AbstractCustomMap.prototype._openInfoWindowForAlias = function(aliasId, onready)
if (typeof onready === "function") {
onready();
}
- })
+ });
});
}
};
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 22cf4d8da5328ae8373c1144a6c08f54d8c072cd..e7cdad54f52156d8292fb9ea8d2bf0bfecbe0e66 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -1243,7 +1243,7 @@ CustomMap.prototype.getReferenceGenome = function(type, version) {
organism:self.getProject().getOrganism().name,
}).then(function(genome){
self._referenceGenome[type][version] =genome;
- return genome
+ return genome;
});
} else {
return Promise.resolve(self._referenceGenome[type][version]);
diff --git a/frontend-js/src/main/js/map/window/AliasInfoWindow.js b/frontend-js/src/main/js/map/window/AliasInfoWindow.js
index f0bfc92cfb93293623e351ca404866fe33be034c..426554859f23629f51e7cedeb637971750388632 100644
--- a/frontend-js/src/main/js/map/window/AliasInfoWindow.js
+++ b/frontend-js/src/main/js/map/window/AliasInfoWindow.js
@@ -25,7 +25,6 @@ function AliasInfoWindow(aliasParam, map) {
this.setAlias(aliasParam);
}
- var self = this;
var alias = this.getAlias();
var point = new google.maps.Point(alias.x + alias.width / 2, alias.y + alias.height / 2);
@@ -63,7 +62,7 @@ AliasInfoWindow.prototype.init = function() {
true).then(function(alias) {
return self.update(alias);
});
-}
+};
/**
* Creates and returns chart representing data related to alias on different
@@ -162,35 +161,33 @@ AliasInfoWindow.prototype.createChartDiv = function() {
*/
AliasInfoWindow.prototype.createContentDiv = function() {
var self = this;
- return new Promise(function(resolve, reject) {
- var alias = self.getAlias();
- if (alias.isComplete()) {
- var result = document.createElement("div");
- var title = document.createElement("h3");
- title.innerHTML = alias.type + ": " + alias.name;
- result.appendChild(title);
-
- var layoutsDiv = document.createElement("div");
-
- result.appendChild(layoutsDiv);
-
- self.getCustomMap().getAliasVisibleLayoutsData(alias.getId()).then(function(layoutAliases) {
- self.layoutAliases = layoutAliases;
- return self.getCustomMap().getVisibleLayoutNames();
- }).then(function(layoutNames) {
- self.layoutNames = layoutNames;
- return self.createChartDiv();
- }).then(function(chartDiv) {
- layoutsDiv.appendChild(chartDiv);
- return self.createGenomicDiv();
- }).then(function(genomicDiv) {
- layoutsDiv.appendChild(genomicDiv);
- resolve(result);
- });
- } else {
- resolve(self.createWaitingContentDiv());
- }
- });
+ var alias = self.getAlias();
+ if (alias.isComplete()) {
+ var result = document.createElement("div");
+ var title = document.createElement("h3");
+ title.innerHTML = alias.type + ": " + alias.name;
+ result.appendChild(title);
+
+ var layoutsDiv = document.createElement("div");
+
+ result.appendChild(layoutsDiv);
+
+ return self.getCustomMap().getAliasVisibleLayoutsData(alias.getId()).then(function(layoutAliases) {
+ self.layoutAliases = layoutAliases;
+ return self.getCustomMap().getVisibleLayoutNames();
+ }).then(function(layoutNames) {
+ self.layoutNames = layoutNames;
+ return self.createChartDiv();
+ }).then(function(chartDiv) {
+ layoutsDiv.appendChild(chartDiv);
+ return self.createGenomicDiv();
+ }).then(function(genomicDiv) {
+ layoutsDiv.appendChild(genomicDiv);
+ return result;
+ });
+ } else {
+ return Promise.resolve(self.createWaitingContentDiv());
+ }
};
/**
@@ -272,7 +269,7 @@ AliasInfoWindow.prototype.createGenomicDiv = function() {
+ variant.getReferenceGenomeVersion() + " not loaded");
}
});
- })
+ });
}
}).then(function() {
diff --git a/frontend-js/src/test/js/map/overlay/AliasOverlay-test.js b/frontend-js/src/test/js/map/overlay/AliasOverlay-test.js
index ec5956c739aad49bbf9552da4463d2c68ed2ea9e..394683bf71fd6bb46ebd08d6af1ab46293eb6d8a 100644
--- a/frontend-js/src/test/js/map/overlay/AliasOverlay-test.js
+++ b/frontend-js/src/test/js/map/overlay/AliasOverlay-test.js
@@ -4,7 +4,6 @@ var Helper = require('../../Helper');
var logger = require('../../logger');
-var IdentifiedElement = require('../../../../main/js/map/data/IdentifiedElement');
var AliasOverlay = require('../../../../main/js/map/overlay/AliasOverlay');
var assert = require('assert');
diff --git a/frontend-js/src/test/js/mocha-config.js b/frontend-js/src/test/js/mocha-config.js
index 3acd8c75d39880fa436844fefb06c3ea91884337..880c5de972918543123ff628a49278c8a8775700 100644
--- a/frontend-js/src/test/js/mocha-config.js
+++ b/frontend-js/src/test/js/mocha-config.js
@@ -26,19 +26,19 @@ window.open = function() {
return result;
};
-//pileup is using heavily some browser defined javascript
+// pileup is using heavily some browser defined javascript
var pileup = require('pileup');
pileup.create = function() {
return {
destroy : function() {
}
- }
+ };
};
pileup.formats.twoBit = function() {
- return {}
+ return {};
};
pileup.formats.bigBed = function() {
- return {}
+ return {};
};
// ---