aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meer <michael@meer.name>2014-01-30 19:54:12 +0100
committerMichael Meer <michael@meer.name>2014-01-30 19:54:12 +0100
commitda1e7cc211b7d74c81c942c4eece392b603ecc59 (patch)
tree1af45bb3a4c4195da9e987f1eab473f2df247693
parentc5ac5544cb02aa3194c5cab2b3ab736a2e19e6eb (diff)
parent48bc9b546cdc0fae23efc3756e37ce59dc81737a (diff)
downloadvolse-hubzilla-da1e7cc211b7d74c81c942c4eece392b603ecc59.tar.gz
volse-hubzilla-da1e7cc211b7d74c81c942c4eece392b603ecc59.tar.bz2
volse-hubzilla-da1e7cc211b7d74c81c942c4eece392b603ecc59.zip
Merge branch 'master' of https://github.com/friendica/red
.
-rw-r--r--view/tpl/chat.tpl7
1 files changed, 4 insertions, 3 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 13862c339..c65c117cd 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -28,6 +28,7 @@ $('#chat-form').submit(function(ev) {
$('body').css('cursor','wait');
$.post("chatsvc", $('#chat-form').serialize(),function(data) {
if(chat_timer) clearTimeout(chat_timer);
+ $('#chatText').val('');
load_chats();
$('body').css('cursor','auto');
},'json');
@@ -40,9 +41,9 @@ function load_chats() {
if(data.success) {
update_inroom(data.inroom);
update_chats(data.chats);
- });
- }
-
+ }
+ });
+
chat_timer = setTimeout(load_chats,10000);
}