X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Froom.js;h=46f861205966f799cdc3141a7bba7c3121aeec6b;hb=c96ea8bcfeea99ab6c21cc4773ed2e550b3155d9;hp=ff7255f6748ba10595b767d1331325ca245747bc;hpb=b4428d29f4be28cef3c854f7b5578fc9b546d1f3;p=brisk.git

diff --git a/web/room.js b/web/room.js
index ff7255f..46f8612 100644
--- a/web/room.js
+++ b/web/room.js
@@ -69,6 +69,10 @@ function state_add(flags)
             name = "st_eye.png";
             tit = (g_lang == 'en' ? "I'm here!" : "sono presente!");
             break;
+        case 0x800:
+            name = "st_rabbit.png";
+            tit = (g_lang == 'en' ? "Rabbit time" : "sono a spasso col coniglio");
+            break;
         default:
             break;
         }
@@ -226,32 +230,44 @@ function j_stand_tdcont(el)
     return (content);
 }
 
-function j_stand_cont(data)
+function j_stand_cont(ddata)
 {
-    var i;
+    var i, ii;
     var content;
     var st = 0, name = "";
     var curtag, nextag;
 
+    var data;
+
+    if (g_listen & l_list_isol) {
+        data = new Array();
+
+        for (i = 0, ii = 0 ; ii < ddata.length ; ii++) {
+            if ((ddata[ii][0] & 0x02) == 0) {
+                continue;
+            }
+            data[i++] = ddata[ii];
+        }
+    }
+    else
+        data = ddata;
+
     if (standup_data_old == null || data.length < 4) {
     // if (standup_data_old == null) {
         
         content = '<table cols="'+(data.length < 4 ? data.length : 4)+'" class="table_standup">';
-        for (i = 0, ii = 0 ; ii < data.length ; ii++) {
-            if (g_listen & l_list_isol && ((data[ii][0] & 0x02) == 0)) {
-                continue;
-            }
+        for (i = 0 ; i < data.length ; i++) {
             if ((i % 4) == 0)
                 content += '<tr>';
             content += '<td id="'+i+'" class="room_standup">';
-            content += j_stand_tdcont(data[ii]);
+            content += j_stand_tdcont(data[i]);
             content += '</td>';
             
             if ((i % 4) == 3)
                 content += '</tr>';
-
-            i++;
         }
+        if ((i % 4) < 3)
+            content += '</tr>';
         content += '</table>';
         
         $("standup").innerHTML = content;
@@ -291,8 +307,7 @@ function j_stand_cont(data)
                     break;
                 }
             }
-            if (e == data.length || 
-                (g_listen & l_list_isol && ((data[i][0] & 0x02) == 0))) {
+            if (e == data.length) {
                 idx_del[idx_del_n++] = i;
                 map_cur[i] = -1;
             }
@@ -313,8 +328,7 @@ function j_stand_cont(data)
                     break;
                 }
             }
-            if (i == standup_data_old.length &&
-                !(g_listen & l_list_isol && ((data[e][0] & 0x02) == 0))) {
+            if (i == standup_data_old.length) {
                 // console.log("ADD: "+data[e][1]);
                 arr_add[idx_add_n]   = data[e];
                 map_add[idx_add_n++] = e;
@@ -695,6 +709,11 @@ function list_set(what, is_update, info)
             relo = true;
         g_listen = l_list_all;
     }
+
+    set_checked_value($('ra_listen_auth'), what);
+    set_checked_value($('ra_listen_isol'), what);
+    set_checked_value($('ra_listen_all'),  what);
+
     $('list_info').innerHTML = info;
     if (is_update) {
         createCookie("CO_list", what, 24*365, cookiepath);
@@ -710,11 +729,20 @@ function list_set(what, is_update, info)
             
             $('td_noauth'+i).style.display = (what == 'isolation' ? 'none' : '');
         }
-        // ricalculation of standup area
-        if (standup_data_old != null) {
-            standup_data = standup_data_old;
-            standup_data_old = null;
-            j_stand_cont(standup_data);
+        if (what == 'isolation') {
+            tra.hide_noauth();
+        }
+        else {
+            tra.show_noauth();
+        }
+            
+        if (false) {
+            // ricalculation of standup area
+            if (standup_data_old != null) {
+                standup_data = standup_data_old;
+                standup_data_old = null;
+                j_stand_cont(standup_data);
+            }
         }
     }
 }