projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move lowercase transformation outside SQL
[brisk.git]
/
web
/
commons.js
diff --git
a/web/commons.js
b/web/commons.js
index
1e47fe7
..
7dcf922
100644
(file)
--- a/
web/commons.js
+++ b/
web/commons.js
@@
-1,7
+1,7
@@
/*
* brisk - commons.js
*
/*
* brisk - commons.js
*
- * Copyright (C) 2006-201
2
Matteo Nastasi
+ * Copyright (C) 2006-201
5
Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@
-145,7
+145,7
@@
function getStyle(x,IEstyleProp, MozStyleProp)
})()
})()
-function addEvent(obj,
type,
fn)
+function addEvent(obj,
type,
fn)
{
if (obj.addEventListener) {
obj.addEventListener( type, fn, false);
{
if (obj.addEventListener) {
obj.addEventListener( type, fn, false);
@@
-358,7
+358,12
@@
function chatt_checksend(obj,e)
}
function act_chatt(value)
{
}
function act_chatt(value)
{
- send_mesg("chatt|"+encodeURIComponent(value));
+ if (value.substring(0, 6) == "/info ") {
+ info_show(value.substring(6));
+ }
+ else {
+ send_mesg("chatt|"+encodeURIComponent(value));
+ }
/*
obj.disabled = true;
obj.value = "";
/*
obj.disabled = true;
obj.value = "";
@@
-1024,12
+1029,12
@@
var chatt_lines_n = 0;
var CHATT_MAXLINES = 40;
var CHATT_MAXLINES = 40;
-function user_decorator(user)
+function user_decorator(user
, is_real
)
{
var name, i, sp = "", cl = "";
var flags = user[0] & 0x03 | ((user[0] & 0x0c0000) >> 16);
{
var name, i, sp = "", cl = "";
var flags = user[0] & 0x03 | ((user[0] & 0x0c0000) >> 16);
- console.log(user[1]+" FLAGS: "+flags);
+
//
console.log(user[1]+" FLAGS: "+flags);
for (i = 0 ; i < 4 ; i++) {
if (flags & (1 << i)) {
for (i = 0 ; i < 4 ; i++) {
if (flags & (1 << i)) {
@@
-1038,10
+1043,14
@@
function user_decorator(user)
}
}
}
}
- if (flags != 0)
- name = "<span class='" + cl + "'><span>"+user[1]+"</span></span>";
- else
+ if (flags != 0) {
+ name = "<span class='" + cl + "'><span class='" +
+ (is_real && (flags & 0xfffffe && ((flags & 0x01) == 0)) ? "id_usr" : "") +
+ "'>" + user[1] + "</span></span>";
+ }
+ else {
name = user[1];
name = user[1];
+ }
return (name);
}
return (name);
}
@@
-1051,7
+1060,7
@@
function user_dec_and_state(el)
var content = "";
var val_el;
var content = "";
var val_el;
- content = user_decorator(el);
+ content = user_decorator(el
, true
);
content += state_add(el[0],(typeof(el[2]) != 'undefined' ? el[2] : null));
return (content);
content += state_add(el[0],(typeof(el[2]) != 'undefined' ? el[2] : null));
return (content);
@@
-1066,7
+1075,7
@@
function chatt_sub(dt,data,str)
var flags;
var isauth;
var bolder = [ (data[0] | 1), data[1] ];
var flags;
var isauth;
var bolder = [ (data[0] | 1), data[1] ];
- name = user_decorator(bolder);
+ name = user_decorator(bolder
, false
);
if ($("txt").scrollTop + parseInt(getStyle($("txt"),"height", "height")) - $("txt").scrollHeight >= 0)
must_scroll = true;
if ($("txt").scrollTop + parseInt(getStyle($("txt"),"height", "height")) - $("txt").scrollHeight >= 0)
must_scroll = true;