Skip to content
Snippets Groups Projects

Resolve "Incomplete logout"

Merged Piotr Gawron requested to merge 1990-incomplete-logout into master
2 files
+ 26
10
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -593,6 +593,10 @@ OverlayPanel.prototype.refresh = function (showDefault) {
self.getProject().addOrUpdateDataOverlays(overlaysFromServer);
if (user.getLogin() === "anonymous") {
self.hideUserOverlaySection();
}
var overlays = self.getProject().getDataOverlays();
for (var index = 0; index < overlays.length; index++) {
var remove = true;
@@ -705,16 +709,7 @@ OverlayPanel.prototype.refresh = function (showDefault) {
var refreshButton = $("[name='refreshOverlays']", self.getElement());
var tableElement = $("[name='customOverlaysTab']", self.getElement());
if (user.getLogin() === "anonymous") {
title.innerHTML = 'YOU ARE NOT LOGGED IN. PLEASE, <a href="#">LOG IN</a> '
+ 'TO UPLOAD AND VIEW CUSTOM OVERLAYS<br/><center><button>LOGIN</button></center>';
var openLoginDialog = function () {
return self.getParent().getLoginDialog().open();
};
$(title).find("a")[0].onclick = openLoginDialog;
$(title).find("button")[0].onclick = openLoginDialog;
addButton.hide();
refreshButton.hide();
tableElement.hide();
self.hideUserOverlaySection();
} else {
tableElement.show();
title.innerHTML = self.getCustomOverlaysMessage();
@@ -770,6 +765,25 @@ OverlayPanel.prototype.refresh = function (showDefault) {
});
};
OverlayPanel.prototype.hideUserOverlaySection = function () {
var self = this;
var title = self.getControlElement(PanelControlElementType.OVERLAY_CUSTOM_OVERLAY_TITLE);
var addButton = $("[name='addOverlay']", self.getElement());
var refreshButton = $("[name='refreshOverlays']", self.getElement());
var tableElement = $("[name='customOverlaysTab']", self.getElement());
title.innerHTML = 'YOU ARE NOT LOGGED IN. PLEASE, <a href="#">LOG IN</a> '
+ 'TO UPLOAD AND VIEW CUSTOM OVERLAYS<br/><center><button>LOGIN</button></center>';
var openLoginDialog = function () {
return self.getParent().getLoginDialog().open();
};
$(title).find("a")[0].onclick = openLoginDialog;
$(title).find("button")[0].onclick = openLoginDialog;
addButton.hide();
refreshButton.hide();
tableElement.hide();
}
/**
*
* @param {string} customOverlaysMessage
Loading