#24: Prevent canceled requests from fetching

miguel-perez · Aug 14, 2014 · 479b44e · 479b44e
1 parent 53d38dd
commit 479b44e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/jquery.smoothState.js b/jquery.smoothState.js
@@ -361,7 +361,10 @@
                                 }
 
                                 setTimeout(function () {
-                                    responses[cache[url].status]();
+                                    // Might of been canceled, better check!
+                                    if(cache.hasOwnProperty(url)){
+                                        responses[cache[url].status]();
+                                    }
                                 }, 10);
                             },
 
@@ -427,14 +430,16 @@
                     // Don't fetch we have the content already
                     if(cache.hasOwnProperty(url)) return;
 
+                    cache = utility.clearIfOverCapacity(cache, options.pageCacheSize);
+
                     cache[url] = { status: "fetching" };
+
                     var requestUrl  = options.alterRequestUrl(url) || url,
                         request     = $.ajax(requestUrl);
 
                     // Store contents in cache variable if successful
                     request.success(function (html) {
                         // Clear cache varible if it's getting too big
-                        cache = utility.clearIfOverCapacity(cache, options.pageCacheSize);
                         utility.storePageIn(cache, url, html);
                         $container.data('smoothState').cache = cache;
                     });

diff --git a/smoothState.jquery.json b/smoothState.jquery.json
@@ -10,7 +10,7 @@
         "ui",
         "ajaxify"
     ],
-    "version": "0.4.1",
+    "version": "0.5.0",
     "author": {
         "name": "Miguel Angel Perez",
         "url": "http://miguel-perez.com/"