ff-stream-web

commit 6af02afd8757f3901f0bc8bcad75c87fa9a3b57e
parent 3207fb44792b3271ded517a2f939cea41c2bf2ff
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Mon,  7 Mar 2016 13:33:37 +0300

Fix GraphQL resolve method in src/data/queries/news.js

Diffstat:
M
src/data/queries/news.js
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/data/queries/news.js b/src/data/queries/news.js
@@ -16,28 +16,29 @@ const url = 'http://ajax.googleapis.com/ajax/services/feed/load' +
             '?v=1.0&num=10&q=https://reactjsnews.com/feed.xml';
 
 let items = [];
-let fetching = null;
+let lastFetchTask;
 let lastFetchTime = new Date(1970, 0, 1);
 
 const news = {
   type: new List(NewsItemType),
   resolve() {
-    if (fetching) {
-      return fetching;
+    if (lastFetchTask) {
+      return lastFetchTask;
     }
 
     if ((new Date() - lastFetchTime) > 1000 * 60 * 10 /* 10 mins */) {
       lastFetchTime = new Date();
-      fetch(url)
+      lastFetchTask = fetch(url)
         .then(response => response.json())
         .then(data => {
           if (data.responseStatus === 200) {
             items = data.responseData.feed.entries;
-            fetching = null;
           }
 
           return items;
         });
+
+      return lastFetchTask;
     }
 
     return items;