Рефакторинг, очистка, работа над ошибками, связанными с базой, отказ от глобальной переменной $user во многих файлах.
Singleton в некоторых местах вместо решения #42. Новые шаги для решения #16 и #52. Closes #42. Closes #32. Closes #31.
This commit is contained in:
+19
-19
@@ -94,51 +94,51 @@ var chat = {
|
||||
},
|
||||
lookSmiles:function()
|
||||
{
|
||||
if($('#chbtn8').attr('class')=='db cp chatBtn8_1')
|
||||
if($('#chbtn8').attr('class')=='getInstance cp chatBtn8_1')
|
||||
{
|
||||
$('#ttSmiles').css('display','');
|
||||
$('#chbtn8').attr('class','db cp chatBtn8_2');
|
||||
$('#chbtn8').attr('class','getInstance cp chatBtn8_2');
|
||||
}else{
|
||||
$('#ttSmiles').css('display','none');
|
||||
$('#chbtn8').attr('class','db cp chatBtn8_1');
|
||||
$('#chbtn8').attr('class','getInstance cp chatBtn8_1');
|
||||
}
|
||||
},
|
||||
filterMsg:function()
|
||||
{
|
||||
if($('#chbtn1').attr('class')=='db cp chatBtn1_1')
|
||||
if($('#chbtn1').attr('class')=='getInstance cp chatBtn1_1')
|
||||
{
|
||||
$('#chbtn1').attr('class','db cp chatBtn1_2'); this.filter = 1;
|
||||
$('#chbtn1').attr('class','getInstance cp chatBtn1_2'); this.filter = 1;
|
||||
}else{
|
||||
$('#chbtn1').attr('class','db cp chatBtn1_1'); this.filter = 0;
|
||||
$('#chbtn1').attr('class','getInstance cp chatBtn1_1'); this.filter = 0;
|
||||
}
|
||||
},
|
||||
systemMsg:function()
|
||||
{
|
||||
if($('#chbtn4').attr('class')=='db cp chatBtn4_1')
|
||||
if($('#chbtn4').attr('class')=='getInstance cp chatBtn4_1')
|
||||
{
|
||||
$('#chbtn4').attr('class','db cp chatBtn4_2'); this.citySys = 1; $.cookie('citySys',1);
|
||||
$('#chbtn4').attr('class','getInstance cp chatBtn4_2'); this.citySys = 1; $.cookie('citySys',1);
|
||||
}else{
|
||||
$('#chbtn4').attr('class','db cp chatBtn4_1'); this.citySys = 0; $.cookie('citySys',0);
|
||||
$('#chbtn4').attr('class','getInstance cp chatBtn4_1'); this.citySys = 0; $.cookie('citySys',0);
|
||||
}
|
||||
},
|
||||
soundChat:function()
|
||||
{
|
||||
if($('#chbtn7').attr('class')=='db cp chatBtn7_1')
|
||||
if($('#chbtn7').attr('class')=='getInstance cp chatBtn7_1')
|
||||
{
|
||||
$('#chbtn7').attr('class','db cp chatBtn7_2'); this.sound = 1;
|
||||
}else if($('#chbtn7').attr('class')=='db cp chatBtn7_2'){
|
||||
$('#chbtn7').attr('class','db cp chatBtn7_3'); this.sound = 2;
|
||||
$('#chbtn7').attr('class','getInstance cp chatBtn7_2'); this.sound = 1;
|
||||
}else if($('#chbtn7').attr('class')=='getInstance cp chatBtn7_2'){
|
||||
$('#chbtn7').attr('class','getInstance cp chatBtn7_3'); this.sound = 2;
|
||||
}else{
|
||||
$('#chbtn7').attr('class','db cp chatBtn7_1'); this.sound = 0;
|
||||
$('#chbtn7').attr('class','getInstance cp chatBtn7_1'); this.sound = 0;
|
||||
}
|
||||
},
|
||||
translitChat:function()
|
||||
{
|
||||
if($('#chbtn6').attr('class')=='db cp chatBtn6_1')
|
||||
if($('#chbtn6').attr('class')=='getInstance cp chatBtn6_1')
|
||||
{
|
||||
$('#chbtn6').attr('class','db cp chatBtn6_2'); this.translit = 1;
|
||||
$('#chbtn6').attr('class','getInstance cp chatBtn6_2'); this.translit = 1;
|
||||
}else{
|
||||
$('#chbtn6').attr('class','db cp chatBtn6_1'); this.translit = 0;
|
||||
$('#chbtn6').attr('class','getInstance cp chatBtn6_1'); this.translit = 0;
|
||||
}
|
||||
},subValSend:'',
|
||||
subSend:function()
|
||||
@@ -409,7 +409,7 @@ var chat = {
|
||||
if(top.cb_date[top.cb_select] == 4 || top.cb_date[top.cb_select] == 5) {
|
||||
$('#canal'+top.cb_date[top.cb_select]).html('');
|
||||
$('#textmsg').focus();
|
||||
};
|
||||
}
|
||||
}
|
||||
}else{
|
||||
$('#textmsg').val('');
|
||||
@@ -692,7 +692,7 @@ var chat = {
|
||||
},
|
||||
convert2:function(txt)
|
||||
{
|
||||
var trn = new Array();
|
||||
var trn = [];
|
||||
trn = txt.split(' ');
|
||||
for(var i=0;i<trn.length;i++) {
|
||||
if(trn[i].indexOf("//") < 0 && trn[i].indexOf('@') < 0 && trn[i].indexOf("www.") < 0 && !(trn[i].charAt(0)==":" && trn[i].charAt(trn[i].length-1)==":")) {
|
||||
|
||||
Reference in New Issue
Block a user