diff --git a/apps/reader/views.py b/apps/reader/views.py index 486e96934..c8ffee26b 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -341,7 +341,7 @@ def load_single_feed(request, feed_id): page = int(request.REQUEST.get('page', 1)) dupe_feed_id = None userstories_db = None - + if page: offset = limit * (page-1) if not feed_id: raise Http404 diff --git a/config/gunicorn_conf.py b/config/gunicorn_conf.py index 34d79a9c9..4a7537d24 100644 --- a/config/gunicorn_conf.py +++ b/config/gunicorn_conf.py @@ -8,6 +8,8 @@ def numCPUs(): bind = "127.0.0.1:8000" pidfile = "/home/sclay/newsblur/logs/gunicorn.pid" logfile = "/home/sclay/newsblur/logs/production.log" +accesslog = "/home/sclay/newsblur/logs/production.log" +errorlog = "/home/sclay/newsblur/logs/errors.log" loglevel = "debug" name = "newsblur" timeout = 60 diff --git a/media/js/jquery.ajaxmanager.3.js b/media/js/jquery.ajaxmanager.3.js index 10be8c4d6..9c99df670 100644 --- a/media/js/jquery.ajaxmanager.3.js +++ b/media/js/jquery.ajaxmanager.3.js @@ -2,7 +2,7 @@ * project-site: http://plugins.jquery.com/project/AjaxManager * repository: http://github.com/aFarkas/Ajaxmanager * @author Alexander Farkas - * @version 3.11 + * @version 3.12 * Copyright 2010, Alexander Farkas * Dual licensed under the MIT or GPL Version 2 licenses. */ @@ -40,7 +40,7 @@ this.name = name; this.qName = name; - this.opts = $.extend({}, $.ajaxSettings, $.manageAjax.defaults, opts); + this.opts = $.extend({}, $.manageAjax.defaults, opts); if(opts && opts.queue && opts.queue !== true && typeof opts.queue === 'string' && opts.queue !== 'clear'){ this.qName = opts.queue; } @@ -315,6 +315,7 @@ abortIsNoSuccess: true, maxRequests: 1, cacheResponse: false, + async: true, domCompleteTrigger: false, domSuccessTrigger: false, preventDoubleRequests: true, diff --git a/media/js/newsblur/assetmodel.js b/media/js/newsblur/assetmodel.js index f61edaeac..8beaf5943 100644 --- a/media/js/newsblur/assetmodel.js +++ b/media/js/newsblur/assetmodel.js @@ -93,6 +93,10 @@ NEWSBLUR.AssetModel.Reader.prototype = { }, error: function(e, textStatus, errorThrown) { NEWSBLUR.log(['AJAX Error', textStatus, errorThrown]); + if (errorThrown == 'abort') { + return; + } + if ($.isFunction(error_callback)) { error_callback(); } else if ($.isFunction(callback)) { diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js index b617cfa32..40dd81d18 100644 --- a/media/js/newsblur/reader.js +++ b/media/js/newsblur/reader.js @@ -2099,6 +2099,7 @@ }, show_stories_error: function() { + console.log(["show_stories_error", arguments]); this.hide_stories_progress_bar(); var $error = $.make('div', { className: 'NB-feed-error' }, [