X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Froom.js;h=c25728bab3f80fd4ab915d4fd3a9b93f040f3f18;hb=328de26963e512cc34c999baf67f449020a62bfd;hp=f4bb465d611e0e05c617b48539643f934fecbea9;hpb=507a79a6e6c512a2b0ac0af6e067f5a8845b7d9c;p=brisk.git diff --git a/web/room.js b/web/room.js index f4bb465..c25728b 100644 --- a/web/room.js +++ b/web/room.js @@ -1,7 +1,7 @@ /* * brisk - room.js * - * Copyright (C) 2006-2012 Matteo Nastasi + * Copyright (C) 2006-2014 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -106,7 +106,7 @@ function state_add(flags, comp) } if ((flags & 0xf0000) != 0) { - superst = flags & 0xf0000; + superst = flags & 0x20000; if (name != "") { supersfx = "_side"; } @@ -263,6 +263,9 @@ function j_stand_tdcont(el) return (user_dec_and_state(el)); } +/* + ddata = [ [ , , ], ... ] + */ function j_stand_cont(ddata) { var i, ii; @@ -285,9 +288,11 @@ function j_stand_cont(ddata) else data = ddata; + // WARNING: + // + // managing update needs this branch (for few users and the else!!) + // if (standup_data_old == null || data.length < 4) { - // if (standup_data_old == null) { - content = ''; for (i = 0 ; i < data.length ; i++) { if ((i % 4) == 0) @@ -305,18 +310,6 @@ function j_stand_cont(ddata) $("standup").innerHTML = content; - // console.log("inizio"); - // for (i = 0 , curtag = table_walk($("standup")) ; curtag != null ; curtag = table_walk(curtag), i++ ) { - // console.log("inloop["+i+"]: "+curtag.tagName+" ID: "+curtag.id); - // } - // console.log("fine "+i); - - // walktable($("standup"), nextag); - // console.log($("standup").firstChild); - // console.log($("standup").firstChild.firstChild.firstChild.firstChild); - - // log_walk($("standup")); - standup_data_old = data; } else { @@ -346,7 +339,9 @@ function j_stand_cont(ddata) } else { /* modified entries */ - if (standup_data_old[i][0] != data[e][0]) { + if (standup_data_old[i][0] != data[e][0] || + standup_data_old[i].length != data[e].length || + (data[e].length == 3 && standup_data_old[i][2] != data[e][2])) { arr_mod[idx_mod_n] = data[e]; idx_mod[idx_mod_n++] = i; } @@ -465,14 +460,21 @@ function j_tab_act_cont(idx, act) $("table_act"+idx).innerHTML = ''; } else if (act == 'sitreser') { - // // MLANG 1 - $("table_act"+idx).innerHTML = ''; + $("table_act"+idx).innerHTML = ''; + } + else if (act == 'sitcert') { + // MLANG 1 + $("table_act"+idx).innerHTML = ''; } else if (act == 'wake') { // MLANG 1 $("table_act"+idx).innerHTML = ''; } + else if (act == 'resercert') { + // MLANG 1 + $("table_act"+idx).innerHTML = ''; + } else if (act == 'reserved') { // MLANG 1 $("table_act"+idx).innerHTML = '';