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

fix scrollbar on chat + compress css files + add remove filter inlist

Browse Source
This commit is contained in:
lutranf
2014-10-28 20:55:22 +01:00
parent 6b149c445d
commit 3697c32017
13 changed files with 57 additions and 3940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
masks/chat.html
View File

@@ -97,9 +97,6 @@ databap.pageInit = function()
//Loading the chat
self.initScrollBar('#chat_container', '#chat_messages_box', '#chat_messages');
$('#chat_container').find('.thumb')
.mousedown(function(){self.tmp('scrolling', true);})
.mouseup(function(){self.tmp('scrolling', false);});
//Loading Chans
setChanButton();
@@ -387,6 +384,8 @@ function switchChan(sChanKeyName)
//Show current channel messages
databap.getMainElem('#chat_messages').find('p').hide();
databap.getMainElem('#chat_messages').find('p.class_'+sChanKeyName+', p.class_'+databap.consts.all_chan_id).show();
//Update scrollbar
databap.updateScrollBar(self.tmp('scrolling')?'relative':'bottom');
//Show Current channel members
@@ -403,7 +402,6 @@ function syncUnreadMsg()
databap.tmp('unread_msg'),
function(sChanName, iUnreadMsg)
{
//debug('chan '+sChanName+' : '+iUnreadMsg+' unread messages');
iCountUnread += iUnreadMsg;
}
);
@@ -644,6 +642,7 @@ function add_message(e)
function refresh_chat(bReset)
{
var bReset = (typeof bReset != 'undefined' && bReset == true);
self.tmp('scrolling', (!bReset && !databap.isScrollBarAtBottom()));
if(typeof oChatTimer != "undefined") clearTimeout(oChatTimer);
if(databap.vars.current_page == 'chat')
{
@@ -822,6 +821,9 @@ function addMessage(message_info, bReset)
iUnreadCount = (databap.tmp(['unread_msg', sUnreadChanName]) || 0) + 1;
databap.tmp(['unread_msg', sUnreadChanName], iUnreadCount);
}
//Move to bottom if user is typing
if(message_info.id_user===databap.vars.user_id) self.tmp('scrolling', false);
}
}

1
masks/index.html
View File

@@ -49,6 +49,7 @@
<li><a href="#table"><i class="fa fa-fw fa-20 fa-c-table"></i>ajouter une table</a></li>
<li><a href="#doc"><i class="fa fa-fw fa-20 fa-c-doc"></i>ajouter une doc</a></li>
<li><a href="#liste"><i class="fa fa-fw fa-20 fa-c-list"></i>liste compl&egrave;te</a></li>
<li><a href="#note"><i class="fa fa-fw fa-20 fa-c-note"></i>Note OSS</a></li>
<li><a href="#profil"><i class="fa fa-fw fa-20 fa-c-profile"></i>profil</a></li>
<li><a href="#chat"><i class="fa fa-fw fa-20 fa-c-chat"></i>chat</a></li>
<li><a href="#options"><i class="fa fa-fw fa-20 fa-c-options"></i>paramètres</a></li>

7
masks/list.html
View File

@@ -20,6 +20,13 @@ databap.pageInit = function()
databap.updateScrollBar('top');
}, i);
}
$FilterBox.addButton('delete', 'Supprimer les filtres', function($This)
{
$ListBox.children().show();
databap.updateScrollBar('top');
}, 'delete gimmespace');
//self.unifyWidth($FilterBox.children());
//Liste
self.getInfo

2
masks/welcome.html
View File

@@ -16,6 +16,8 @@
<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>Réinsertion des nicknames absent du chan lors des tab dans le cas d'un /invite</li>
<li><i class="fa-li fa fa-c-checked"></i>Suppression de la redescente automatique de la scrollbar dans le chat si elle n'est pas déjà en bas</li>
<li><i class="fa-li fa fa-c-checked"></i>Liste complète: ajout d'un bouton pour supprimer les filtres appliqués</li>
</ul>
</li>
<li><i class="fa-li fa fa-30 fa-c-changelog"></i>Changelog <span class="version_main"></span>.<span class="version_ehp"></span>