cache test on chat

josven · Mar 21, 2012 · 70117c3 · 70117c3
1 parent e3e275f
commit 70117c3
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 23 deletions.
diff --git a/apps/chat/static/js/chat.js b/apps/chat/static/js/chat.js
@@ -1,16 +1,16 @@
 var updateChat = function() {
 
     $.ajax({
-        url: window.location.pathname,
+        url: window.location.pathname + "get/",
         data: {
             's': $("li:[data-id]").first().data('id')
             },
         statusCode: {
             200: function(data) {
+                $('#chatlist .loading-message').fadeOut().remove();
                 var amount = $('#chatlist li.entry').length;
                 $(data).hide().prependTo("#chatlist").slideDown("slow");
                 $('#chatlist li.entry:gt(49)').fadeOut().remove();
-
                 formatJsReplyButton();
                 formatImageDialogs();
                 hilightUserName();
@@ -51,13 +51,14 @@ var hilightUserName = function() {
 };
 
 jQuery(document).ready(function() {
-
+    
     // tinychat
     $('.tinychat_embed').css({
         'height': '85%',
         'margin-top': '3%'
     });
-
+
+    updateChat();
     bindReplyButton();
     hilightUserName();
 

diff --git a/apps/chat/templates/chat.html b/apps/chat/templates/chat.html
@@ -17,11 +17,19 @@
 {% endif %}
 
 <ul id="chatlist" class="flat-list entrylist">
-{% for entry in posts %}
+    {% comment %}
+    {% for entry in posts %}
     <li data-id="{{ entry.id }}" class="entry ui-widget ui-widget-content">    
         {% render_entry entry request %}
     </li>
-{% endfor %}
+    {% endfor %}
+    {% endcomment %}
+
+    <li class="loading-message entry ui-widget ui-widget-content">
+        <h4 class="ui-widget-header entry-head" >Laddar chat...</h4>
+    </li>
+
+
 </ul>
 
 {% endblock content %}
diff --git a/apps/chat/urls.py b/apps/chat/urls.py
@@ -4,14 +4,17 @@
 urlpatterns = patterns('',
     url(r'^$', 'apps.chat.views.chat', name='chat'),
 
+    # Get chat, ajax api
+    url(r'^get/$', 'apps.chat.views.get_chat', name='get_chat'),
+
     # Post
     url(r'^post/$', 'apps.chat.views.chat', name='chat_post'),
 
     # Return a single post
-    url(r'^(?P<id>\d*)\.(?P<type>\w*)$', 'apps.chat.views.chatpost', name='chatpost'),    
+    #url(r'^(?P<id>\d*)\.(?P<type>\w*)$', 'apps.chat.views.chatpost', name='chatpost'),    
 
     # Return a range posts
-    url(r'^(?P<id1>\d*)-(?P<id2>\d*)\.(?P<type>\w*)$', 'apps.chat.views.chatposts', name='chatposts'),
+    #url(r'^(?P<id1>\d*)-(?P<id2>\d*)\.(?P<type>\w*)$', 'apps.chat.views.chatposts', name='chatposts'),
 
     #Tinychat
      url(r'^camchat/$', 'apps.chat.views.camchat', name='camchat'),

diff --git a/apps/chat/views.py b/apps/chat/views.py
@@ -8,6 +8,8 @@
 from django.http import Http404, HttpResponse
 from django.conf import settings
 
+import site_settings
+
 from apps.core.utils import render
 
 """
@@ -19,11 +21,6 @@
 
 """
 
-"""
-    Constants
-"""
-LIST_ITEM_LIMIT = 30
-
 @never_cache
 @login_required(login_url='/auth/login/')
 def camchat(request):
@@ -33,7 +30,7 @@ def camchat(request):
     messages.add_message(request, messages.INFO, 'Lösenord är:fisk')    
     return render(request,'tinychat.html', vars)
 
-@never_cache
+
 @login_required(login_url='/auth/login/')
 def chat(request):
     vars = {
@@ -48,9 +45,22 @@ def chat(request):
                     form.save()
                     return HttpResponse(status=200) # OK!
             return HttpResponse(status=404) #CHANGE THIS
-
+
+    vars['form'] = PostForm()
+    vars['posts'] = Post.active.order_by('-date_created')[:site_settings.CHAT_LIST_ITEM_LIMIT]
+
+    return render(request,'chat.html', vars)
+
+@never_cache   
+@login_required(login_url='/auth/login/')
+def get_chat(request):
+
+    vars = {}
+
+    if request.is_ajax():     
         if request.method == 'GET':
-            posts = Post.active.order_by('-date_created')[:LIST_ITEM_LIMIT]
+
+            posts = Post.active.order_by('-date_created')[:site_settings.CHAT_LIST_ITEM_LIMIT]
             client_post = int(float( request.GET.get('s', '0') ) )
             current_post = int(float( posts[0].id ) )
             number_of_posts = current_post - client_post
@@ -59,13 +69,15 @@ def chat(request):
                 vars['posts'] = posts[0:number_of_posts]
                 return render(request,'_chat.html', vars)
 
-            return HttpResponse(status=302) # Not changed                
+            return HttpResponse(status=302) # Not changed
 
-    vars['form'] = PostForm()
-    vars['posts'] = Post.active.order_by('-date_created')[:LIST_ITEM_LIMIT]
-
-    return render(request,'chat.html', vars)
+    # Only allow ajax get
+    return HttpResponse(status=404)
 
+
+'''
+OLD
+
 @never_cache
 @login_required(login_url='/auth/login/')
 def chatpost(request,id,type):
@@ -133,7 +145,7 @@ def chatposts(request,id1,id2,type):
             vars['isFirstPage'] = True
         else:
            # Trim query to match orginal request
-           posts = posts[1:LIST_ITEM_LIMIT+1]
+           posts = posts[1:site_settings.CHAT_LIST_ITEM_LIMIT+1]
     except:
         # "no match"
         raise Http404
@@ -149,4 +161,5 @@ def chatposts(request,id1,id2,type):
             raise Http404
     else:
         # "wrong method"
-        raise Http404
+        raise Http404
+'''