Split login and main screen («hall») and make all those screens «submodules» of the screen module

This commit is contained in:
Tissevert 2019-12-11 22:03:16 +01:00
parent d018c7e62c
commit 8f3567660f
5 changed files with 53 additions and 9 deletions

View file

@ -14,9 +14,10 @@
<script src="session.js"></script> <script src="session.js"></script>
<script src="room.js"></script> <script src="room.js"></script>
<script src="statusHandler.js"></script> <script src="statusHandler.js"></script>
<script src="login.js"></script>
<script src="hanafuda.js"></script> <script src="hanafuda.js"></script>
<script src="game.js"></script> <script src="screen/game.js"></script>
<script src="screen/hall.js"></script>
<script src="screen/login.js"></script>
<script src="main.js"></script> <script src="main.js"></script>
<link rel="stylesheet" href="screen.css" type="text/css"/> <link rel="stylesheet" href="screen.css" type="text/css"/>
<link rel="stylesheet" href="login.css" type="text/css"/> <link rel="stylesheet" href="login.css" type="text/css"/>
@ -33,7 +34,7 @@
</p> </p>
</form> </form>
</div> </div>
<div id="main"> <div id="hall">
<form id="room"> <form id="room">
<p id="invite"> <p id="invite">
<label for="them"></label><input type="text" name="them"/> <label for="them"></label><input type="text" name="them"/>

View file

@ -10,9 +10,10 @@ window.addEventListener('load', function() {
var session = Session({messaging: messaging, save: save}); var session = Session({messaging: messaging, save: save});
var room = Room({dom: dom, messaging: messaging, session: session, fun: fun}); var room = Room({dom: dom, messaging: messaging, session: session, fun: fun});
var statusHandler = StatusHandler(); var statusHandler = StatusHandler();
var login = Login({dom: dom, i18n: i18n, messaging: messaging, room: room, save: save, screen: screen, session: session, statusHandler: statusHandler}); var login = Screen.Login({dom: dom, i18n: i18n, messaging: messaging, room: room, save: save, screen: screen, session: session, statusHandler: statusHandler});
var hall = Screen.Hall({dom: dom, i18n: i18n, messaging: messaging, room: room, save: save, screen: screen, session: session, statusHandler: statusHandler});
var hanafuda = Hanafuda({fun: fun}); var hanafuda = Hanafuda({fun: fun});
var game = Game({async: async, dom: dom, i18n: i18n, fun: fun, hanafuda: hanafuda, messaging: messaging, room: room, screen: screen, session: session, statusHandler: statusHandler}); var game = Screen.Game({async: async, dom: dom, i18n: i18n, fun: fun, hanafuda: hanafuda, messaging: messaging, room: room, screen: screen, session: session, statusHandler: statusHandler});
var domElems = { var domElems = {
join: document.getElementById('login').join, join: document.getElementById('login').join,

View file

@ -1,4 +1,4 @@
function Game(modules) { Screen.Game = function(modules) {
var deck = document.getElementById("deck"); var deck = document.getElementById("deck");
var rest = document.getElementById("rest"); var rest = document.getElementById("rest");
var status = { var status = {

View file

@ -1,4 +1,4 @@
function Login(modules) { Screen.Hall = function(modules) {
var root = document.getElementById('login'); var root = document.getElementById('login');
var playersMessage = root.getElementsByClassName('message')[0]; var playersMessage = root.getElementsByClassName('message')[0];
var players = document.getElementById('players').getElementsByClassName('list')[0]; var players = document.getElementById('players').getElementsByClassName('list')[0];
@ -68,9 +68,8 @@ function Login(modules) {
}); });
modules.messaging.addEventListener(["LogIn"], function(o) { modules.messaging.addEventListener(["LogIn"], function(o) {
//playersChanged();
if(modules.session.is(o.from)) { if(modules.session.is(o.from)) {
modules.screen.select('main'); modules.screen.select('hall');
} }
}); });

43
www/screen/login.js Normal file
View file

@ -0,0 +1,43 @@
Screen.Login = function(modules) {
var root = document.getElementById('login');
var join = document.getElementById("join");
var submit = root.submitButton;
init();
return {};
function init() {
initDOMEvents();
initMessageHandlers();
var name = modules.save.get('player.name');
if(name != undefined && name.length > 0) {
root.you.value = name;
formDisable(false);
}
}
function initDOMEvents() {
root.addEventListener('submit', function(e) {
e.preventDefault();
modules.session.start(root.you.value);
});
}
function initMessageHandlers() {
modules.messaging.addEventListener(["LogIn"], function(o) {
if(modules.session.is(o.from)) {
modules.screen.select('hall');
}
});
modules.messaging.addEventListener('open', function() {formDisable(false);});
modules.messaging.addEventListener('close', function() {formDisable(true);});
}
function formDisable(disabled) {
[submit, root.name].forEach(function(button) {
button.disabled = disabled || !modules.messaging.isOn();
});
}
}