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

getTopOverviewImage cannot return null

parent 907dafa3
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!421Resolve "Session expiry notification"
...@@ -10,6 +10,7 @@ var OverviewDialog = require('../OverviewDialog'); ...@@ -10,6 +10,7 @@ var OverviewDialog = require('../OverviewDialog');
var PanelControlElementType = require('../PanelControlElementType'); var PanelControlElementType = require('../PanelControlElementType');
var Functions = require('../../Functions'); var Functions = require('../../Functions');
// noinspection JSUnusedLocalSymbols
var logger = require('../../logger'); var logger = require('../../logger');
/** /**
...@@ -187,16 +188,15 @@ TopMenu.prototype.init = function () { ...@@ -187,16 +188,15 @@ TopMenu.prototype.init = function () {
commentCheckbox.onclick = function () { commentCheckbox.onclick = function () {
ServerConnector.getSessionData(project).setShowComments(commentCheckbox.checked); ServerConnector.getSessionData(project).setShowComments(commentCheckbox.checked);
if (commentCheckbox.checked) { if (commentCheckbox.checked) {
$(refreshCommentButton).css("display","inline"); $(refreshCommentButton).css("display", "inline");
} else { } else {
$(refreshCommentButton).css("display","none"); $(refreshCommentButton).css("display", "none");
} }
return self.getMap().refreshComments().then(null, GuiConnector.alert); return self.getMap().refreshComments().then(null, GuiConnector.alert);
}; };
refreshCommentButton.onclick = (function () { refreshCommentButton.onclick = (function () {
return function () { return function () {
self.getMap().refreshComments(); return self.getMap().refreshComments();
return false;
}; };
})(); })();
...@@ -207,16 +207,18 @@ TopMenu.prototype.init = function () { ...@@ -207,16 +207,18 @@ TopMenu.prototype.init = function () {
}; };
})(); })();
if (project.getTopOverviewImage() !== undefined && project.getTopOverviewImage() !== null) { if (project.getTopOverviewImage() !== undefined) {
self._overviewDialog = new OverviewDialog({ self._overviewDialog = new OverviewDialog({
customMap: self.getMap(), customMap: self.getMap(),
configuration: self.getConfiguration(),
project: self.getProject(),
element: self.getControlElement(PanelControlElementType.OVERVIEW_DIALOG_DIV) element: self.getControlElement(PanelControlElementType.OVERVIEW_DIALOG_DIV)
}); });
var showOverviewButton = self.getControlElement(PanelControlElementType.MENU_SHOW_OVERVIEW_BUTTON); var showOverviewButton = self.getControlElement(PanelControlElementType.MENU_SHOW_OVERVIEW_BUTTON);
showOverviewButton.onclick = function () { showOverviewButton.onclick = function () {
return self._overviewDialog.showOverview(); return self._overviewDialog.showOverview();
}; };
$(showOverviewButton).css("display","inline-block"); $(showOverviewButton).css("display", "inline-block");
} }
if (ServerConnector.getSessionData().getShowComments()) { if (ServerConnector.getSessionData().getShowComments()) {
......
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