franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix nicknames list for /invites

Browse Source
This commit is contained in:
Franzz
2014-10-28 00:14:45 +01:00
parent e55f2b6153
commit e7d45b4d3c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
masks/chat.html
View File

@@ -542,7 +542,7 @@ function add_message(e)
if(!e.altKey && iChatMsgLen>0) if(!e.altKey && iChatMsgLen>0)
{ {
var iCurPos, iFirstPos, iOffset, sWord, sWordLen; var iCurPos, iFirstPos, iOffset, sWord, sWordLen, bInvite;
//Loading previous data //Loading previous data
bLooping = !$.isEmptyObject(databap.tmp('tab_info')); bLooping = !$.isEmptyObject(databap.tmp('tab_info'));
@@ -569,6 +569,7 @@ function add_message(e)
} }
} }
sWordLen = sWord.length; sWordLen = sWord.length;
bInvite = (sChatMsg.substr(0, 7) == '/invite');
//No guess if not at least one letter //No guess if not at least one letter
if(sWordLen>0) if(sWordLen>0)
@@ -578,7 +579,7 @@ function add_message(e)
var iSafeWordLen = sSafeWord.length; var iSafeWordLen = sSafeWord.length;
//List of current channel users //List of current channel users
var asUserList = databap.tmp(['users', getChanKeyName(currentChan())]); var asUserList = databap.tmp(['users', bInvite?databap.consts.all_chan_id:getChanKeyName(currentChan())]);
var asSafeUserList = Object.keys(asUserList); var asSafeUserList = Object.keys(asUserList);
var iUserListLen = asSafeUserList.length; var iUserListLen = asSafeUserList.length;
@@ -849,8 +850,13 @@ function refresh_users()
chan_info, chan_info,
function(key, user_info) function(key, user_info)
{ {
//Add nickname to connected user list
var sNickName = user_info.nickname; var sNickName = user_info.nickname;
databap.tmp(['users', sChankeyName, getSafeNickname(sNickName)], sNickName); var sSafeNickName = getSafeNickname(sNickName);
databap.tmp(['users', sChankeyName, sSafeNickName], sNickName);
databap.tmp(['users', databap.consts.all_chan_id, sSafeNickName], sNickName);
//Append name to user list box
var profileLink = databap.getInternalLink('profil', user_info.id_user); var profileLink = databap.getInternalLink('profil', user_info.id_user);
var mission = 'Mission actuelle : '+(user_info.status || 'Aucune'); var mission = 'Mission actuelle : '+(user_info.status || 'Aucune');
var pm = 'Cliquez pour lancer un channel privé avec '+user_info.name+' ('+user_info.company+')'; var pm = 'Cliquez pour lancer un channel privé avec '+user_info.name+' ('+user_info.company+')';

1
masks/welcome.html
View File

@@ -15,6 +15,7 @@
<li><i class="fa-li fa fa-c-checked"></i>Réparation des messages non lus dans le chat</li> <li><i class="fa-li fa fa-c-checked"></i>Réparation des messages non lus dans le chat</li>
<li><i class="fa-li fa fa-c-checked"></i>Plantage lors de la recherche infructueuse de table</li> <li><i class="fa-li fa fa-c-checked"></i>Plantage lors de la recherche infructueuse de table</li>
<li><i class="fa-li fa fa-c-checked"></i>Bon rafraichissement de la barre de défilement dans la recherche</li> <li><i class="fa-li fa fa-c-checked"></i>Bon rafraichissement de la barre de défilement dans la recherche</li>
<li><i class="fa-li fa fa-c-checked"></i>Réinsertion des nicknames absent du chan lors des tab dans le cas d'un /invite</li>
</ul> </ul>
</li> </li>
<li><i class="fa-li fa fa-30 fa-c-changelog"></i>Changelog <span class="version_main"></span>.<span class="version_ehp"></span> <li><i class="fa-li fa fa-30 fa-c-changelog"></i>Changelog <span class="version_main"></span>.<span class="version_ehp"></span>