projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'together-for-fun' into nginx
[brisk.git]
/
web
/
commons.js
diff --git
a/web/commons.js
b/web/commons.js
index
b3c6138
..
29f6056
100644
(file)
--- a/
web/commons.js
+++ b/
web/commons.js
@@
-359,7
+359,7
@@
function chatt_checksend(obj,e)
function act_chatt(value)
{
if (value.substring(0, 6) == "/info ") {
function act_chatt(value)
{
if (value.substring(0, 6) == "/info ") {
-
show_user_info
(value.substring(6));
+
info_show
(value.substring(6));
}
else {
send_mesg("chatt|"+encodeURIComponent(value));
}
else {
send_mesg("chatt|"+encodeURIComponent(value));
@@
-430,11
+430,6
@@
function act_roadmap()
send_mesg("roadmap");
}
send_mesg("roadmap");
}
-function act_whysupport()
-{
- send_mesg("whysupport");
-}
-
function act_lascio()
{
send_mesg("lascio");
function act_lascio()
{
send_mesg("lascio");
@@
-1038,17
+1033,19
@@
function user_decorator(user, is_real)
for (i = 0 ; i < 4 ; i++) {
if (flags & (1 << i)) {
for (i = 0 ; i < 4 ; i++) {
if (flags & (1 << i)) {
- cl += sp + "au" + i;
+ cl += sp + "au" + i
+ (is_real ? "" : "_off")
;
sp = " ";
}
}
sp = " ";
}
}
- if (flags != 0)
+ if (flags != 0)
{
name = "<span class='" + cl + "'><span class='" +
name = "<span class='" + cl + "'><span class='" +
- (is_real && (flags & 0xfffffe) ? "id_usr" : "") +
- "'>"+user[1]+"</span></span>";
- else
+ (is_real && (flags & 0xfffffe && ((flags & 0x01) == 0)) ? "id_usr" : "") +
+ "'>" + user[1] + "</span></span>";
+ }
+ else {
name = user[1];
name = user[1];
+ }
return (name);
}
return (name);
}
@@
-1391,7
+1388,7
@@
function url_complete(parent, url)
}
// alert("host: ["+host+"] path: ["+path+"]");
}
// alert("host: ["+host+"] path: ["+path+"]");
- if (url.substring(0,6) == 'http:/' || url.substring(0,7) == 'https:/' || url.substring(0,4) == 'ws:/') {
+ if (url.substring(0,6) == 'http:/' || url.substring(0,7) == 'https:/' || url.substring(0,4) == 'ws:/'
|| url.substring(0,5) == 'wss:/'
) {
return (url);
}
else if (url.substring(0,1) == '/') {
return (url);
}
else if (url.substring(0,1) == '/') {