Skip to content
Snippets Groups Projects
Commit 9f6ab10a authored by Piotr Gawron's avatar Piotr Gawron
Browse files

lint issues

parent bafc7326
No related branches found
No related tags found
2 merge requests!115Resolve "admin panel should use API",!114Resolve "admin panel should use API"
Showing
with 30 additions and 40 deletions
......@@ -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);
};
......
......@@ -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;
......
"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() {
......
"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;
"use strict";
/* exported Promise*/
/* exported logger */
var AbstractAdminPanel = require('./AbstractAdminPanel');
......
......@@ -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;
......@@ -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({
......
"use strict";
/* exported logger */
/* exported Promise*/
var AbstractAdminPanel = require('./AbstractAdminPanel');
......
"use strict";
/* exported logger */
/* exported Promise*/
var AbstractAdminPanel = require('./AbstractAdminPanel');
......
......@@ -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",
......
......@@ -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",
......
......@@ -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);
}));
});
......
......@@ -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');
......
......@@ -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);
});
......
"use strict";
/* exported logger */
var ObjectWithListeners = require('../../ObjectWithListeners');
var Annotation = require("./Annotation");
......
......@@ -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;
......
"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,
......
"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');
......
......@@ -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);
});
});
});
......
......@@ -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());
})
});
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment