diff --git a/apps/reader/views.py b/apps/reader/views.py index f90fe4ec2..b45081540 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -525,7 +525,7 @@ def load_single_feed(request, feed_id): include_hidden = is_true(request.REQUEST.get('include_hidden', False)) message = None user_search = None - + dupe_feed_id = None user_profiles = [] now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone) diff --git a/media/js/newsblur/common/assetmodel.js b/media/js/newsblur/common/assetmodel.js index 04e5877cb..ba0328524 100644 --- a/media/js/newsblur/common/assetmodel.js +++ b/media/js/newsblur/common/assetmodel.js @@ -53,7 +53,8 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({ 'traditional': true, 'domSuccessTrigger': true, 'preventDoubleRequests': false, - 'timeout': 15000 + 'timeout': 15000, + 'retry': true }, options); var request_type = options.request_type || 'POST'; var clear_queue = false; @@ -104,6 +105,12 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({ NEWSBLUR.log(['AJAX Error', e, e.status, textStatus, errorThrown, !!error_callback, error_callback, $.isFunction(callback)]); + if (options.retry) { + NEWSBLUR.log(['Retrying...', url, data, !!callback, !!error_callback, options]); + options.retry = false; + self.make_request(url, data, callback, error_callback, options); + return; + } if (errorThrown == "timeout") textStatus = "NewsBlur timed out trying
to connect. Just try again."; if (error_callback) { error_callback(e, textStatus, errorThrown);