Skip to content

Commit 624247e

Browse files
committed
__loginAnnouncements
1 parent a69e0b5 commit 624247e

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

services/static-webserver/client/source/class/osparc/announcement/AnnouncementUIFactory.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,8 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
1919
extend: qx.core.Object,
2020
type: "singleton",
2121

22-
properties: {
23-
announcement: {
24-
check: "osparc.announcement.Announcement",
25-
init: null,
26-
nullable: false,
27-
event: "changeAnnouncement",
28-
apply: "__applyAnnouncement"
29-
}
22+
events: {
23+
"changeAnnouncements": "qx.event.type.Event",
3024
},
3125

3226
statics: {
@@ -87,6 +81,7 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
8781
const announcement = new osparc.announcement.Announcement(announcementData);
8882
this.__announcements.push(announcement);
8983
});
84+
this.fireEvent("changeAnnouncements");
9085
},
9186

9287
__applyAnnouncement: function() {

services/static-webserver/client/source/class/osparc/auth/ui/LoginView.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,23 @@ qx.Class.define("osparc.auth.ui.LoginView", {
3737

3838
members: {
3939
__loginBtn: null,
40+
__loginAnnouncements: null,
4041

4142
// overrides base
4243
_buildPage: function() {
4344
const announcementUIFactory = osparc.announcement.AnnouncementUIFactory.getInstance();
45+
const showAnnouncement = () => {
46+
if (this.__loginAnnouncements) {
47+
this.remove(this.__loginAnnouncements);
48+
}
49+
this.__loginAnnouncements = announcementUIFactory.createLoginAnnouncements();
50+
this.addAt(this.__loginAnnouncements, 0);
51+
};
4452
if (announcementUIFactory.hasLoginAnnouncement()) {
45-
this.addAt(announcementUIFactory.createLoginAnnouncements(), 0);
53+
showAnnouncement();
4654
} else {
47-
announcementUIFactory.addListenerOnce("changeAnnouncement", e => {
48-
if (announcementUIFactory.hasLoginAnnouncement()) {
49-
this.addAt(announcementUIFactory.createLoginAnnouncements(), 0);
50-
}
55+
announcementUIFactory.addListenerOnce("changeAnnouncements", () => {
56+
showAnnouncement();
5157
});
5258
}
5359

0 commit comments

Comments
 (0)