From 8f371fdd4f1279375e5cfa5a79be73dc4c0b40b0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 20 Oct 2010 22:12:50 -0600 Subject: [PATCH] /browse: Force AJAX requests to never be cached as the user has no way of requesting a refresh for them. --- resources/content_server/browse/browse.js | 3 +++ src/calibre/library/server/browse.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js index 5e3cee14c0..e7e359c163 100644 --- a/resources/content_server/browse/browse.js +++ b/resources/content_server/browse/browse.js @@ -156,6 +156,7 @@ function category() { if (href) { $.ajax({ url:href, + cache: false, data:{'sort':cookie(sort_cookie_name)}, success: function(data) { this.children(".loaded").html(data); @@ -212,6 +213,7 @@ function load_page(elem) { url: href, context: elem, dataType: "json", + cache : false, type: 'POST', timeout: 600000, //milliseconds (10 minutes) data: {'ids': ids}, @@ -263,6 +265,7 @@ function show_details(a_dom) { $.ajax({ url: book.find('.details-href').attr('title'), context: bd, + cache: false, dataType: "json", timeout: 600000, //milliseconds (10 minutes) error: function(xhr, stat, err) { diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py index d8d67c3824..463fcd6fde 100644 --- a/src/calibre/library/server/browse.py +++ b/src/calibre/library/server/browse.py @@ -168,6 +168,9 @@ class Endpoint(object): # {{{ sort_val = cookie[eself.sort_cookie_name].value kwargs[eself.sort_kwarg] = sort_val + # Remove AJAX caching disabling jquery workaround arg + kwargs.pop('_', None) + ans = func(self, *args, **kwargs) cherrypy.response.headers['Content-Type'] = eself.mimetype updated = self.db.last_modified()