Small changes
This commit is contained in:
@@ -38,10 +38,10 @@ window.onload = function() {
|
||||
var lobbiesAsTableRows = _.reduce(this.lobbies, function (memo, lobby) {
|
||||
|
||||
var joinButton = (lobby.status === "NotStarted()") ? '<button class="btn btn-primary join-as-player" onclick="joinDecider(\''+lobby.lobbyActorName+'\')">' +
|
||||
'<img src="assets/images/buttons/isAuto.png" style="height: 25px;"> Join lobby <img src="assets/images/buttons/isAuto.png" style="height: 25px;">' +
|
||||
'<img src="/assets/images/buttons/isAuto.png" style="height: 25px;"> Join lobby <img src="/assets/images/buttons/isAuto.png" style="height: 25px;">' +
|
||||
'</button>' : "";
|
||||
var observerButton = '<button class="btn btn-success join-as-observer" onclick="observerDecider(\''+lobby.lobbyActorName+'\')">' +
|
||||
'<img src="assets/images/buttons/Ulthwe.png" style="height: 25px;"> Observer <img src="assets/images/buttons/Ulthwe.png" style="height: 25px;">' +
|
||||
'<img src="/assets/images/buttons/Ulthwe.png" style="height: 25px;"> Observer <img src="/assets/images/buttons/Ulthwe.png" style="height: 25px;">' +
|
||||
'</button>';
|
||||
|
||||
return memo + '<tr>\n' +
|
||||
@@ -118,12 +118,12 @@ window.onload = function() {
|
||||
message = JSON.parse(event.data);
|
||||
switch (message.type) {
|
||||
case "refreshLobby":
|
||||
renderMaps(message.lobby.maps);
|
||||
renderMaps(message.lobby.maps, message.lobby.status);
|
||||
renderPlayersAndStats(message.lobby);
|
||||
break;
|
||||
case "switchToLobby":
|
||||
console.log(message);
|
||||
switchToLobby(message.lobby.maps);
|
||||
switchToLobby(message.lobby.maps, message.lobby.status);
|
||||
renderPlayersAndStats(message.lobby);
|
||||
break;
|
||||
case "sendMessage":
|
||||
@@ -180,9 +180,9 @@ function changeNick() {
|
||||
|
||||
// -----ф-ии прихода с сервера
|
||||
|
||||
function switchToLobby(maps) {
|
||||
function switchToLobby(maps, status) {
|
||||
console.log(maps);
|
||||
renderMaps(maps);
|
||||
renderMaps(maps, status);
|
||||
$("#lobbies").hide();
|
||||
$(".navbar").hide();
|
||||
$("#decider").show();
|
||||
@@ -199,7 +199,7 @@ function disconnectLobby(error) {
|
||||
alert(error);
|
||||
}
|
||||
|
||||
function renderMaps(maps) {
|
||||
function renderMaps(maps, lobbyStatus) {
|
||||
var resHtml = "";
|
||||
|
||||
_.each(maps, function (map) {
|
||||
@@ -210,8 +210,9 @@ function renderMaps(maps) {
|
||||
banHtml = "<div class = 'banX'>✕</div>";
|
||||
banClass = "bannedMap";
|
||||
}
|
||||
|
||||
|
||||
if(lobbyStatus === "NotStarted()"){
|
||||
banClass = "bannedMap";
|
||||
}
|
||||
|
||||
resHtml = resHtml + '<div class="col-xs-4 col-md-3 col-lg-2"><button class = "mapSelect" onmousedown="banMap(\''+map.map+'\')">'+
|
||||
'<div class="mapImageAndText '+banClass+'">' +
|
||||
@@ -303,8 +304,8 @@ function renderPlayersAndStats(lobby) {
|
||||
disabledText = "disabled";
|
||||
}
|
||||
resHtml += "<br/><select class=\"form-control\" id = 'deciderOption' onChange='changeLobbyType()' "+disabledText+" >" +
|
||||
"<option "+last3Selected+" value = 'last3'>Play on last 3 maps</option>" +
|
||||
"<option "+last4Selected+" value = 'last4'>Play on last 4 maps</option>" +
|
||||
/*"<option "+last3Selected+" value = 'last3'>Play on last 3 maps</option>" +
|
||||
"<option "+last4Selected+" value = 'last4'>Play on last 4 maps</option>" +*/
|
||||
"<option "+looserPickSelected+" value = 'looserpick'>Decide first, then looserpick</option>" +
|
||||
"</select>"
|
||||
resHtml += "</div>";
|
||||
|
||||
Reference in New Issue
Block a user