From ba1c7d7cc9984fbee8fa3be2a1359e0957a51b78 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 4 Apr 2013 20:14:39 +0400
Subject: [PATCH] do not set active feed id in headlines callback, bailout if
received data for currently deselected feed
---
js/feedlist.js | 2 ++
js/viewfeed.js | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/js/feedlist.js b/js/feedlist.js
index 3154a2887..f4e07517e 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -132,6 +132,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
console.log(query);
+ setActiveFeedId(feed, is_cat);
+
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 7813ab7ef..76f9bbaee 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -49,7 +49,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
return;
}
- setActiveFeedId(feed_id, is_cat);
+ if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())
+ return;
/* dijit.getEnclosingWidget(
document.forms["main_toolbar_form"].update).attr('disabled',
--
GitLab