From 9f6ab10a52d22e9eb4bf3d16473453cce43020cd Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 11 Aug 2017 17:39:39 +0200
Subject: [PATCH] lint issues
---
frontend-js/src/main/js/Admin.js | 2 +-
frontend-js/src/main/js/ServerConnector.js | 1 -
frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js | 4 ++--
frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js | 5 +++--
.../src/main/js/gui/admin/ConfigurationAdminPanel.js | 1 +
frontend-js/src/main/js/gui/admin/EditProjectDialog.js | 5 ++---
frontend-js/src/main/js/gui/admin/MapsAdminPanel.js | 9 ++++-----
frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js | 1 +
frontend-js/src/main/js/gui/admin/UsersAdminPanel.js | 1 +
.../src/main/js/gui/export/GraphicsExportPanel.js | 6 +-----
frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js | 9 +++++----
.../src/main/js/gui/leftPanel/PublicationListDialog.js | 2 +-
frontend-js/src/main/js/map/AbstractCustomMap.js | 1 -
frontend-js/src/main/js/map/data/MapModel.js | 5 ++---
frontend-js/src/main/js/map/data/Project.js | 2 ++
frontend-js/src/test/js/gui/OverviewDialog-test.js | 1 -
frontend-js/src/test/js/gui/admin/EditProjectDialog.js | 5 +----
frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js | 3 +--
.../src/test/js/gui/leftPanel/AbstractPanel-test.js | 2 +-
frontend-js/src/test/js/map/AbstractCustomMap-test.js | 5 +----
frontend-js/src/test/js/minerva-test.js | 1 -
21 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/frontend-js/src/main/js/Admin.js b/frontend-js/src/main/js/Admin.js
index 184b29648f..fa0b4cf6f0 100644
--- a/frontend-js/src/main/js/Admin.js
+++ b/frontend-js/src/main/js/Admin.js
@@ -145,7 +145,7 @@ Admin.prototype.init = function() {
for (var i = 0; i < this._panels.length; i++) {
promises.push(this._panels[i].init());
}
- promises.push(this.getHeader().init())
+ promises.push(this.getHeader().init());
return Promise.all(promises);
};
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index e8f9083b4d..e965871d68 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -661,7 +661,6 @@ ServerConnector.getConfigurationParam = function (paramId) {
ServerConnector.getModels = function (projectId) {
var queryParams = {};
var filterParams = {};
- var project;
var self = this;
return self.getProjectId(projectId).then(function (result) {
queryParams.projectId = result;
diff --git a/frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js b/frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js
index 81c2db02b6..d74a6d09e3 100644
--- a/frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js
@@ -1,10 +1,10 @@
"use strict";
/* exported logger */
+/* exported Promise*/
var Panel = require('../Panel');
-var GuiConnector = require('../../GuiConnector');
var logger = require('../../logger');
var Functions = require('../../Functions');
var Promise = require("bluebird");
@@ -23,7 +23,7 @@ AbstractAdminPanel.prototype._createHeader = function(name) {
type : "h1",
content : name
}));
-}
+};
AbstractAdminPanel.prototype.init = function() {
diff --git a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
index 1ad62cac5a..abba9a8bae 100644
--- a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
@@ -1,5 +1,6 @@
"use strict";
+/* exported Promise*/
/* exported logger */
var AbstractAdminPanel = require('./AbstractAdminPanel');
@@ -83,7 +84,7 @@ CommentsAdminPanel.prototype._createGui = function() {
content : "Project",
}));
projectsCell.appendChild(selectProject);
-}
+};
CommentsAdminPanel.prototype.init = function() {
var self = this;
@@ -198,6 +199,6 @@ CommentsAdminPanel.prototype.commentToTableRow = function(comment) {
remove, //
toYesNo(comment.isPinned()) ];
return row;
-}
+};
module.exports = CommentsAdminPanel;
diff --git a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js
index 094597a458..1e592606f9 100644
--- a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js
@@ -1,5 +1,6 @@
"use strict";
+/* exported Promise*/
/* exported logger */
var AbstractAdminPanel = require('./AbstractAdminPanel');
diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index e224bc9fc5..1c70a7d3bd 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -24,7 +24,6 @@ EditProjectDialog.prototype.constructor = EditProjectDialog;
EditProjectDialog.prototype.createGui = function() {
var self = this;
var element = self.getElement();
- var project = self.getProject();
var tabDiv = Functions.createElement({
type : "div",
@@ -63,7 +62,6 @@ EditProjectDialog.prototype.createGeneralTab = function(tabMenuDiv, tabContentDi
};
EditProjectDialog.prototype.addTab = function(params) {
- var self = this;
var navLi = guiUtils.createTabMenuObject({
id : params.id,
name : params.name,
@@ -293,5 +291,6 @@ EditProjectDialog.prototype.open = function() {
EditProjectDialog.prototype.close = function() {
$(this.getElement()).dialog("close");
-}
+};
+
module.exports = EditProjectDialog;
diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
index b1ac118a21..165b69e6d8 100644
--- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
@@ -103,7 +103,7 @@ MapsAdminPanel.prototype._createProjectTableRow = function() {
}, ],
});
return projectsRow;
-}
+};
MapsAdminPanel.prototype.init = function() {
var self = this;
@@ -128,11 +128,11 @@ MapsAdminPanel.prototype.projectToTableRow = function(project) {
"<button name='removeProject' data='" + project.getProjectId() + "'>REMOVE</button>", //
];
return row;
-}
+};
MapsAdminPanel.prototype.getHtmlStringLink = function(annotation) {
var self = this;
- if (annotation != undefined && annotation != null) {
+ if (annotation !== undefined && annotation !== null) {
var link = self.getGuiUtils().createAnnotationLink(annotation, true);
var tmp = document.createElement("div");
tmp.appendChild(link);
@@ -161,7 +161,7 @@ MapsAdminPanel.prototype.setProjects = function(projects) {
var button = this;
return self.showEditDialog($(button).attr("data")).then(null, GuiConnector.alert);
});
-}
+};
MapsAdminPanel.prototype.onAddClicked = function() {
return Promise.reject(new Error("Not implemented"));
@@ -174,7 +174,6 @@ MapsAdminPanel.prototype.onRefreshClicked = function() {
};
MapsAdminPanel.prototype.showEditDialog = function(id) {
- var self = this;
GuiConnector.showProcessing();
return ServerConnector.getProject(id).then(function(project) {
var dialog = new EditProjectDialog({
diff --git a/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js b/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js
index 70fb723f59..5b18099397 100644
--- a/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js
@@ -1,6 +1,7 @@
"use strict";
/* exported logger */
+/* exported Promise*/
var AbstractAdminPanel = require('./AbstractAdminPanel');
diff --git a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
index 6faa02555e..d716fa2cfa 100644
--- a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
@@ -1,6 +1,7 @@
"use strict";
/* exported logger */
+/* exported Promise*/
var AbstractAdminPanel = require('./AbstractAdminPanel');
diff --git a/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js b/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js
index 4e2f7103a8..545d312a1a 100644
--- a/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js
+++ b/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js
@@ -20,7 +20,6 @@ GraphicsExportPanel.prototype.init = function() {
var element = self.getElement();
var configuration;
element.appendChild(self._createSelectProjectDiv());
- var configuration;
return ServerConnector.getConfiguration().then(function(result) {
configuration = result;
element.appendChild(self._createSelectGraphicsFormatDiv(configuration.getImageConverters()));
@@ -30,9 +29,8 @@ GraphicsExportPanel.prototype.init = function() {
});
};
-GraphicsExportPanel.prototype._createSelectProjectDiv = function(annotations) {
+GraphicsExportPanel.prototype._createSelectProjectDiv = function() {
var self = this;
- var project = self.getProject();
var typeDiv = Functions.createElement({
type : "div",
name : "modelSelectDiv",
@@ -67,8 +65,6 @@ GraphicsExportPanel.prototype._createSelectProjectDiv = function(annotations) {
};
GraphicsExportPanel.prototype._createSelectGraphicsFormatDiv = function(formats) {
- var self = this;
- var project = self.getProject();
var typeDiv = Functions.createElement({
type : "div",
name : "formatSelectDiv",
diff --git a/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js b/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js
index 8507144de2..1e27b92747 100644
--- a/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js
@@ -265,6 +265,7 @@ AbstractPanel.prototype.createTargetRow = function(target, icon) {
iconColumn.style.textAlign = "center";
result.appendChild(iconColumn);
var submaps = [];
+ var i;
if (target.getTargetElements().length > 0) {
var submapAddedIds = [];
iconColumn.appendChild(guiUtils.createIcon(icon));
@@ -278,7 +279,7 @@ AbstractPanel.prototype.createTargetRow = function(target, icon) {
iconColumn.appendChild(checkbox);
var elements = target.getTargetElements();
- for (var i = 0; i < elements.length; i++) {
+ for (i = 0; i < elements.length; i++) {
var elementId = elements[i].getModelId();
if (elementId !== self.getMap().getId() && !submapAddedIds[elementId]) {
submaps.push(elementId);
@@ -302,12 +303,12 @@ AbstractPanel.prototype.createTargetRow = function(target, icon) {
descColumn.appendChild(guiUtils.createLabel("Available in submaps: "));
for (i = 0; i < submaps.length; i++) {
var model = self.getMap().getSubmapById(submaps[i]).getModel();
- var onclick = function() {
+ var onclick = (function() {
var id = model.getId();
return function() {
self.getMap().openSubmap(id);
- }
- }();
+ };
+ }());
var button = Functions.createElement({
type : "button",
className : "minerva-open-submap-button",
diff --git a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
index 26be26a8e1..eb5ec1203e 100644
--- a/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
+++ b/frontend-js/src/main/js/gui/leftPanel/PublicationListDialog.js
@@ -114,7 +114,7 @@ PublicationListDialog.prototype._dataTableAjaxCall = function(data, callback) {
return searchOverlay.searchByQuery(query, true, true).then(function() {
$(self.getElement()).dialog("close");
}).then(null, GuiConnector.alert);
- }
+ };
$("a[name=" + elementData.getId() + "]", $(self.getElement())).click(onclick);
}));
});
diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index 6d10e69789..06bccc48ba 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -9,7 +9,6 @@ var AliasInfoWindow = require('./window/AliasInfoWindow');
var AliasSurface = require('./surface/AliasSurface');
var IdentifiedElement = require('./data/IdentifiedElement');
var ObjectWithListeners = require('../ObjectWithListeners');
-var PointData = require('./data/PointData');
var PointInfoWindow = require('./window/PointInfoWindow');
var ReactionInfoWindow = require('./window/ReactionInfoWindow');
var ReactionSurface = require('./surface/ReactionSurface');
diff --git a/frontend-js/src/main/js/map/data/MapModel.js b/frontend-js/src/main/js/map/data/MapModel.js
index 2d921edb04..1e4e53b9f6 100644
--- a/frontend-js/src/main/js/map/data/MapModel.js
+++ b/frontend-js/src/main/js/map/data/MapModel.js
@@ -750,7 +750,6 @@ MapModel.prototype.getReactionsForElements = function(elements, complete) {
}).then(function(reactions) {
result = reactions;
- var promises = [];
for (var i = 0; i < reactions.length; i++) {
var reaction = reactions[i];
var id = reaction.getId();
@@ -767,8 +766,8 @@ MapModel.prototype.getReactionsForElements = function(elements, complete) {
});
}).then(function() {
var promises = [];
- for (var i=0;i<result.length;i++) {
- promises.push(self.getCompleteReactionById(result[i].getId()));
+ for (var i = 0; i < result.length; i++) {
+ promises.push(self.getCompleteReactionById(result[i].getId()));
}
return Promise.all(promises);
});
diff --git a/frontend-js/src/main/js/map/data/Project.js b/frontend-js/src/main/js/map/data/Project.js
index d488f1955b..c540fc0dbd 100644
--- a/frontend-js/src/main/js/map/data/Project.js
+++ b/frontend-js/src/main/js/map/data/Project.js
@@ -1,5 +1,7 @@
"use strict";
+/* exported logger */
+
var ObjectWithListeners = require('../../ObjectWithListeners');
var Annotation = require("./Annotation");
diff --git a/frontend-js/src/test/js/gui/OverviewDialog-test.js b/frontend-js/src/test/js/gui/OverviewDialog-test.js
index 02fd8ab3ae..862bdeb351 100644
--- a/frontend-js/src/test/js/gui/OverviewDialog-test.js
+++ b/frontend-js/src/test/js/gui/OverviewDialog-test.js
@@ -6,7 +6,6 @@ require("../mocha-config.js");
var CustomMap = require('../../../main/js/map/CustomMap');
var OverviewDialog = require('../../../main/js/gui/OverviewDialog');
-var Project = require('../../../main/js/map/data/Project');
var chai = require('chai');
var assert = chai.assert;
diff --git a/frontend-js/src/test/js/gui/admin/EditProjectDialog.js b/frontend-js/src/test/js/gui/admin/EditProjectDialog.js
index a1859b9948..b60c090763 100644
--- a/frontend-js/src/test/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/test/js/gui/admin/EditProjectDialog.js
@@ -1,10 +1,9 @@
"use strict";
+/* exported assert */
/* exported logger */
var EditProjectDialog = require('../../../../main/js/gui/admin/EditProjectDialog');
-var GuiMessageError = require('../../../../main/js/gui/GuiMessageError');
-var MiriamType = require('../../../../main/js/map/data/MiriamType');
var logger = require('../../logger');
var assert = require('assert');
@@ -16,8 +15,6 @@ describe('EditProjectDialog', function() {
var project;
return ServerConnector.getProject().then(function(result) {
project = result;
- return ServerConnector.getConfiguration();
- }).then(function(configuration) {
dialog = new EditProjectDialog({
element : testDiv,
project : project,
diff --git a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js
index bfcfc48501..22da3cd520 100644
--- a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js
+++ b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js
@@ -1,10 +1,9 @@
"use strict";
/* exported logger */
+/* exported assert */
var MapsAdminPanel = require('../../../../main/js/gui/admin/MapsAdminPanel');
-var GuiMessageError = require('../../../../main/js/gui/GuiMessageError');
-var MiriamType = require('../../../../main/js/map/data/MiriamType');
var logger = require('../../logger');
var assert = require('assert');
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 75339099c7..b0fe518592 100644
--- a/frontend-js/src/test/js/gui/leftPanel/AbstractPanel-test.js
+++ b/frontend-js/src/test/js/gui/leftPanel/AbstractPanel-test.js
@@ -59,7 +59,7 @@ describe('AbstractDbPanel', function() {
});
var htmlTag = panel.createTargetRow(target, "empty.png");
assert.ok(htmlTag);
- assert.equal(1, $(".minerva-open-submap-button", $(htmlTag)).length)
+ assert.equal(1, $(".minerva-open-submap-button", $(htmlTag)).length);
});
});
});
diff --git a/frontend-js/src/test/js/map/AbstractCustomMap-test.js b/frontend-js/src/test/js/map/AbstractCustomMap-test.js
index 178bbea0fa..e1eac29194 100644
--- a/frontend-js/src/test/js/map/AbstractCustomMap-test.js
+++ b/frontend-js/src/test/js/map/AbstractCustomMap-test.js
@@ -5,9 +5,6 @@ var Promise = require("bluebird");
var AliasMarker = require('../../../main/js/map/marker/AliasMarker');
var AliasSurface = require('../../../main/js/map/surface/AliasSurface');
var AbstractCustomMap = require('../../../main/js/map/AbstractCustomMap');
-var PointData = require('../../../main/js/map/data/PointData');
-var PointMarker = require('../../../main/js/map/marker/PointMarker');
-var ReactionMarker = require('../../../main/js/map/marker/ReactionMarker');
var IdentifiedElement = require('../../../main/js/map/data/IdentifiedElement');
var chai = require('chai');
@@ -335,7 +332,7 @@ describe('AbstractCustomMap', function() {
map.fitBounds(markers);
var center2 = map.getGoogleMap().getCenter();
assert.ok(center.lat() !== center2.lat() || center.lng() !== center2.lng());
- })
+ });
});
});
diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js
index 8849af86e7..f824bd41f8 100644
--- a/frontend-js/src/test/js/minerva-test.js
+++ b/frontend-js/src/test/js/minerva-test.js
@@ -4,7 +4,6 @@ require("./mocha-config.js");
var Alias = require('../../main/js/map/data/Alias');
var minerva = require('../../main/js/minerva');
-var Project = require('../../main/js/map/data/Project');
var GuiConnectorMock = require('./GuiConnector-mock');
var ServerConnectorMock = require('./ServerConnector-mock');
var ServerConnectorMock = require('./ServerConnector-mock');
--
GitLab