From ce15dbbfa875ec4d13d7f495f78f0345b1c23471 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 22 Jun 2017 15:59:10 +0200
Subject: [PATCH] lint issues
---
frontend-js/src/main/js/ServerConnector.js | 13 ++++---------
frontend-js/src/main/js/gui/leftPanel/Panel.js | 2 +-
.../src/main/js/gui/leftPanel/ProjectInfoPanel.js | 6 ++----
frontend-js/src/main/js/map/data/MapModel.js | 5 +++--
frontend-js/src/main/js/minerva.js | 13 +++++++------
frontend-js/src/test/js/ServerConnector-mock.js | 1 -
frontend-js/src/test/js/ServerConnector-test.js | 2 +-
.../test/js/gui/leftPanel/ProjectInfoPanel-test.js | 2 +-
8 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index c1e0ed3e98..ddb6dda3c4 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -109,10 +109,8 @@ ServerConnector._readFile = function(url) {
request.get(url, function(error, response, body) {
if (error) {
reject(error);
-
} else if (response.statusCode !== 200) {
- var error = new Error(url + " rejected with status code: " + response.statusCode);
- reject(error);
+ reject(new Error(url + " rejected with status code: " + response.statusCode));
} else {
resolve(body);
}
@@ -164,8 +162,7 @@ ServerConnector.sendPutRequest = function(url, params) {
if (error) {
reject(error);
} else if (response.statusCode !== 200) {
- var error = new Error(url + " rejected with status code: " + response.statusCode);
- reject(error);
+ reject(new Error(url + " rejected with status code: " + response.statusCode));
} else {
resolve(body);
}
@@ -188,8 +185,7 @@ ServerConnector.sendDeleteRequest = function(url, params) {
if (error) {
reject(error);
} else if (response.statusCode !== 200) {
- var error = new Error(url + " rejected with status code: " + response.statusCode);
- reject(error);
+ reject(new Error(url + " rejected with status code: " + response.statusCode));
} else {
resolve(body);
}
@@ -212,8 +208,7 @@ ServerConnector.sendPatchRequest = function(url, params) {
if (error) {
reject(error);
} else if (response.statusCode !== 200) {
- var error = new Error(url + " rejected with status code: " + response.statusCode);
- reject(error);
+ reject(new Error(url + " rejected with status code: " + response.statusCode));
} else {
resolve(body);
}
diff --git a/frontend-js/src/main/js/gui/leftPanel/Panel.js b/frontend-js/src/main/js/gui/leftPanel/Panel.js
index 71c51b3296..49eb417813 100644
--- a/frontend-js/src/main/js/gui/leftPanel/Panel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/Panel.js
@@ -55,7 +55,7 @@ Panel.prototype.createHelpButton = function() {
content : self.getHelpTip(),
});
$(helpDialogDiv).dialog({
- close : function(event, ui) {
+ close : function() {
$(this).dialog('destroy').remove();
},
position : {
diff --git a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
index 401965c26c..9daf37590e 100644
--- a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
@@ -150,7 +150,7 @@ ProjectInfoPanel.prototype._createInfoPanelGui = function() {
content : "<i class='fa fa-files-o'> source file",
});
this.setControlElement(PanelControlElementType.INFO_PROJECT_GET_ORIGINAL_FILE_BUTTON, projectOriginalFileButton);
- var liElement = Functions.createElement({
+ liElement = Functions.createElement({
type : "li",
style : "line-height: 30px",
});
@@ -162,7 +162,7 @@ ProjectInfoPanel.prototype._createInfoPanelGui = function() {
href : ServerConnector.getServerBaseUrl() + "/export.xhtml?id=" + projectId,
content : '<i class="fa fa-mail-forward"> EXPORT',
});
- var liElement = Functions.createElement({
+ liElement = Functions.createElement({
type : "li",
style : "line-height: 30px",
});
@@ -338,8 +338,6 @@ ProjectInfoPanel.prototype.showUserProfilePage = function(user) {
var userDataTabDiv = self.getControlElement(PanelControlElementType.USER_TAB_USER_DIV);
var userLoginTabDiv = self.getControlElement(PanelControlElementType.USER_TAB_LOGIN_DIV);
if (user.getLogin() !== "anonymous") {
- var userLoginTabDiv = self.getControlElement(PanelControlElementType.USER_TAB_LOGIN_DIV);
- var userDataTabDiv = self.getControlElement(PanelControlElementType.USER_TAB_USER_DIV);
var loginText = self.getControlElement(PanelControlElementType.USER_TAB_LOGIN_TEXT);
var nameText = self.getControlElement(PanelControlElementType.USER_TAB_NAME_TEXT);
var surnameText = self.getControlElement(PanelControlElementType.USER_TAB_SURNAME_TEXT);
diff --git a/frontend-js/src/main/js/map/data/MapModel.js b/frontend-js/src/main/js/map/data/MapModel.js
index b9927e770f..8c26b3c016 100644
--- a/frontend-js/src/main/js/map/data/MapModel.js
+++ b/frontend-js/src/main/js/map/data/MapModel.js
@@ -699,7 +699,8 @@ MapModel.prototype.getReactionsForElement = function(element, complete) {
MapModel.prototype.getReactionsForElements = function(elements, complete) {
var self = this;
var ids = [];
- for (var i = 0; i < elements.length; i++) {
+ var i;
+ for (i = 0; i < elements.length; i++) {
ids.push(elements[i].getId());
}
var idString = ids.join();
@@ -709,7 +710,7 @@ MapModel.prototype.getReactionsForElements = function(elements, complete) {
return Promise.resolve(reactions);
} else {
var promises = [];
- for (var i = 0; i < reactions.length; i++) {
+ for (i = 0; i < reactions.length; i++) {
promises.push(self.getCompleteReactionById(reactions[i].getId()));
}
return Promise.all(promises);
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 39e724ef4a..26a16ea5ed 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -239,19 +239,20 @@ function getReactionsForElements(elementIdentifiers, customMap) {
}
var modelScopePromises = [];
- var result = [];
for ( var key in elementsByModelId) {
if (elementsByModelId.hasOwnProperty(key)) {
var model = customMap.getModel().getSubmodelById(parseInt(key));
- var promise = model.getReactionsForElements(elementsByModelId[key], true).then(function(reactions) {
- result = result.concat(reactions);
- });
+ var promise = model.getReactionsForElements(elementsByModelId[key], true);
modelScopePromises.push(promise);
}
}
// first promise fetch all data
- return Promise.all(modelScopePromises).then(function() {
+ return Promise.all(modelScopePromises).then(function(reactionResult) {
+ var result = [];
+ for (var i = 0; i < reactionResult.length; i++) {
+ result = result.concat(reactionResult[i]);
+ }
return result;
});
}
@@ -295,7 +296,7 @@ function createResult(customMap) {
color : identifiedElements[i].getColor(),
opacity : identifiedElements[i].getOpacity(),
}
- }
+ };
result.push(row);
}
return result;
diff --git a/frontend-js/src/test/js/ServerConnector-mock.js b/frontend-js/src/test/js/ServerConnector-mock.js
index 8e62b9ed36..121aa5a524 100644
--- a/frontend-js/src/test/js/ServerConnector-mock.js
+++ b/frontend-js/src/test/js/ServerConnector-mock.js
@@ -7,7 +7,6 @@ var Promise = require("bluebird");
var logger = require('./logger');
var OriginalServerConnector = require('../../main/js/ServerConnector');
-var SessionObjectType = require('../../main/js/SessionObjectType');
var fs = require('fs');
var request = require('request');
diff --git a/frontend-js/src/test/js/ServerConnector-test.js b/frontend-js/src/test/js/ServerConnector-test.js
index 308d7e291f..f2ef1502a0 100644
--- a/frontend-js/src/test/js/ServerConnector-test.js
+++ b/frontend-js/src/test/js/ServerConnector-test.js
@@ -186,7 +186,7 @@ describe('ServerConnector', function() {
return Promise.reject(new NetworkError("xxx", {
statusCode : HttpStatus.FORBIDDEN
}));
- }
+ };
return ServerConnector.login("blabla", "blablabla").then(function() {
ServerConnector.sendPostRequest = method;
assert.ok(false);
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 4beedcbbd9..b015f021ee 100644
--- a/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js
+++ b/frontend-js/src/test/js/gui/leftPanel/ProjectInfoPanel-test.js
@@ -51,7 +51,7 @@ describe('ProjectInfoPanel', function() {
it('open manual', function() {
var div = testDiv;
- var panel = new ProjectInfoPanel({
+ new ProjectInfoPanel({
element : div,
customMap : helper.createCustomMap(),
});
--
GitLab