Skip to content

Commit d54a6fc

Browse files
committed
Updates
1 parent e49131f commit d54a6fc

8 files changed

Lines changed: 37 additions & 16 deletions

File tree

server-src/server.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4823,7 +4823,6 @@ if (process.env.serverPort) {
48234823
if (process.env.PORT) {
48244824
serverPort = Number(process.env.PORT);
48254825
}
4826-
48274826
(async function () {
48284827
await checkServerLoop(); //when it loops back, it accepts the promise.
48294828
server.listen(serverPort);

src/chat/elementjson/chat-styles.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,3 +1663,12 @@ a {
16631663
transform: translate(0, 0) scale(1, 1);
16641664
}
16651665
}
1666+
1667+
.veryImportantDialog {
1668+
position: fixed;
1669+
top: 0;
1670+
left: 0;
1671+
width: 100%;
1672+
height: 100%;
1673+
z-index: 999999999;
1674+
}

src/chat/elementjson/main.js

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require("../../fontface.js");
22
var styles = require("./chat-styles.css"); //Imported as text.
3+
var elements = require("../../gp2/elements.js");
34
//Elements will be processed by gp2/elements.js
45
module.exports = [
56
{
@@ -34,19 +35,27 @@ module.exports = [
3435
require("./noroom.js"),
3536
require("./chatinterface.js"),
3637
require("./chatmenu.js"),
37-
require("./reconnecting.js"),
3838
],
3939
},
40-
require("./accountnotice.js"),
41-
require("./usernameerror.js"),
42-
require("./roomerror.js"),
43-
require("./noguests.js"),
44-
require("./notallowed.js"),
45-
require("./banned.js"),
46-
require("./update.js"),
47-
require("./offlineerror.js"),
48-
require("./installappdialog.js"),
49-
require("./toomanyconnections.js"),
5040
],
5141
},
5242
];
43+
//Dialogs.
44+
elements.appendElementsFromJSON(document.body, [
45+
//Low level dialogs, not really important.
46+
require("./accountnotice.js"),
47+
require("./installappdialog.js"),
48+
49+
//Medium level dialogs, important notices.
50+
require("./usernameerror.js"),
51+
require("./roomerror.js"),
52+
require("./noguests.js"),
53+
require("./notallowed.js"),
54+
require("./toomanyconnections.js"),
55+
56+
require("./reconnecting.js"),
57+
58+
//High level dialogs, these need to be to front.
59+
require("./update.js"),
60+
require("./offlineerror.js"),
61+
]);

src/chat/elementjson/offlineerror.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = {
55
style: {
66
zIndex: 10,
77
},
8+
className: "veryImportantDialog",
89
children: [
910
{
1011
element: "div",

src/chat/elementjson/reconnecting.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = {
55
style: {
66
zIndex: 10,
77
},
8+
className: "veryImportantDialog",
89
children: [
910
{
1011
element: "div",

src/chat/elementjson/update.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = {
55
},
66
gid: "rrUpdateScreen",
77
hidden: true,
8+
className: "veryImportantDialog",
89
children: [
910
{
1011
element: "div",

src/chat/interface/roomselect.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var accountHelper = require("../../accounthelper");
33
var dialog = require("../../dialogs.js");
44
var currentRoom = require("./getroom.js");
55
var KnownUserList = require("./userlist-menu.js");
6+
var commandEffects = elements.getGPId("commandEffects");
67
var rs = {};
78

89
var validState = accountHelper.getCurrentValidationState();
@@ -102,7 +103,7 @@ function doJoinCodeScreen(code) {
102103
},
103104
]);
104105
elements.appendElements(div, dom);
105-
document.body.append(div);
106+
commandEffects.append(div);
106107

107108
return {
108109
remove: function () {
@@ -157,7 +158,7 @@ async function doRoomSelect() {
157158
loadingSpinnerCDiv.append(loadingSpinnerContainerDiv);
158159
loadingSpinnerCDiv.className = "centerMiddle";
159160
dialogBG.append(loadingSpinnerCDiv);
160-
document.body.append(dialogBG);
161+
commandEffects.append(dialogBG);
161162
try {
162163
var rooms = await getRooms();
163164
dialogBG.remove();
@@ -595,7 +596,7 @@ async function doRoomSelect() {
595596
},
596597
]);
597598
elements.appendElements(div, dom);
598-
document.body.append(div);
599+
commandEffects.append(div);
599600
} catch (e) {
600601
window.alert(e);
601602
}

wpstatic/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"timestamp":"1761911048711"}
1+
{"timestamp":"1761913275737"}

0 commit comments

Comments
 (0)