Merge branch 'master' into bootstrap3

This commit is contained in:
psychobunny
2013-08-27 06:03:05 +08:00
20 changed files with 340 additions and 158 deletions

View File

@@ -287,12 +287,14 @@
var username = $(this).parents('li').attr('data-username');
var touid = $(this).parents('li').attr('data-uid');
require(['chat'], function(chat){
if(username === app.username || !app.username)
return;
require(['chat'], function(chat) {
var chatModal = chat.createModalIfDoesntExist(username, touid);
chatModal.show();
chat.bringModalToTop(chatModal);
});
});
ajaxify.register_events([