X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Froom.js;h=26d78e9bbf809579ef0919639eb2f62a15372dcc;hb=refs%2Fheads%2Ffdpass2-pull;hp=c7efc62fef1cc23e4a272b09260bc499cf5c6f9c;hpb=6d8db1ee47d3c0bb14133d3ab2e0a6bdc7ed60a0;p=brisk.git
diff --git a/web/room.js b/web/room.js
index c7efc62..26d78e9 100644
--- a/web/room.js
+++ b/web/room.js
@@ -426,7 +426,7 @@ function j_stand_cont(ddata)
var usr = $("standup").getElementsByClassName("id_usr");
for (i = 0 ; i < usr.length ; i++) {
- addEvent(usr[i], "click", click_update_cb);
+ addEvent(usr[i], "click", info_show_cb);
}
}
@@ -437,28 +437,6 @@ function esco_cb() {
act_logout(0);
};
-var g_user_info_target = "";
-
-function info_show(username)
-{
- // ret = server_request('mesg', 'prefs|save','__POST__', 'prefs', JSON.stringify(g_prefs));
- var udata = server_request('mesg', 'chatt|/info ' + username);
-
- // FIXME: just to be finished
- console.log(udata);
-}
-
-function click_update_cb(e)
-{
- if (g_user_info_target == e.target.innerHTML) {
- g_user_info_target = "";
- info_show(e.target.innerHTML);
- }
- else {
- g_user_info_target = e.target.innerHTML;
- }
-}
-
function j_tab_cont(table_idx, data)
{
var i;
@@ -472,7 +450,7 @@ function j_tab_cont(table_idx, data)
$("table"+table_idx).innerHTML = content;
var usr = $("table"+table_idx).getElementsByClassName("id_usr");
for (i = 0 ; i < usr.length ; i++) {
- addEvent(usr[i], "click", click_update_cb);
+ addEvent(usr[i], "click", info_show_cb);
}
}
@@ -482,6 +460,10 @@ function j_tab_act_cont(idx, act)
// MLANG 1
$("table_act"+idx).innerHTML = '';
}
+ else if (act == 'sitappr') {
+ // MLANG 1
+ $("table_act"+idx).innerHTML = '';
+ }
else if (act == 'sitreser') {
// MLANG 1
$("table_act"+idx).innerHTML = '';
@@ -522,13 +504,13 @@ function j_check_login(login, ret)
(login[i] >= 'A' && login[i] <= 'Z')) {
if (old_c != login[i]) {
old_c = login[i];
- old_ct = 0;
+ old_ct = 1;
}
else {
- if (old_ct > 3) {
+ if (old_ct > 2) {
// FIXME LANG
- ret.ret = (g_lang == 'en' ? "More than three contiguous '" + old_c + "' not allowed." :
- "Il nickname contiene più di tre caratteri '" + old_c + "' consecutivi.");
+ ret.ret = (g_lang == 'en' ? "More than two contiguous '" + old_c + "' not allowed." :
+ "Il nickname contiene più di 2 caratteri '" + old_c + "' consecutivi.");
return (false);
}
}
@@ -657,7 +639,7 @@ function mesgtoadm_formtext_hilite(form)
function j_check_email(email, ret)
{
- if (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,10})+$/.test(email))
+ if (/^\w+([\.-]*\w+)*@\w+([\.-]*\w+)*(\.\w{2,10})+$/.test(email))
return (true);
ret.ret += (g_lang == 'en' ? "Invalid email address. " :
"Indirizzo e-mail non valido.");