X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcommons.js;h=8f3253c142d2d82e33d65a2a88946fb4b718ba73;hb=fc19a0f063cf2e544a61a58b4ac31254f91d6ba5;hp=1e47fe78074a0477ded484f4af5deef4f79e1b8b;hpb=172bffba0aae582e7415546303b60ac9e2813ee2;p=brisk.git
diff --git a/web/commons.js b/web/commons.js
index 1e47fe7..8f3253c 100644
--- a/web/commons.js
+++ b/web/commons.js
@@ -1,7 +1,7 @@
/*
* brisk - commons.js
*
- * Copyright (C) 2006-2012 Matteo Nastasi
+ * Copyright (C) 2006-2015 Matteo Nastasi
* 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);
@@ -358,7 +358,12 @@ function chatt_checksend(obj,e)
}
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 = "";
@@ -1024,12 +1029,12 @@ var chatt_lines_n = 0;
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);
- console.log(user[1]+" FLAGS: "+flags);
+ // console.log(user[1]+" FLAGS: "+flags);
for (i = 0 ; i < 4 ; i++) {
if (flags & (1 << i)) {
@@ -1038,10 +1043,14 @@ function user_decorator(user)
}
}
- if (flags != 0)
- name = ""+user[1]+"";
- else
+ if (flags != 0) {
+ name = "" + user[1] + "";
+ }
+ else {
name = user[1];
+ }
return (name);
}
@@ -1051,7 +1060,7 @@ function user_dec_and_state(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);
@@ -1066,7 +1075,7 @@ function chatt_sub(dt,data,str)
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;
@@ -1384,7 +1393,8 @@ function url_complete(parent, url)
}
// alert("host: ["+host+"] path: ["+path+"]");
- if (url.substring(0,6) == 'http:/' || url.substring(0,7) == 'https:/' || url.substring(0,4) == 'ws:/') {
+ console.log('URL: ' + url);
+ 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) == '/') {