From b0ecc8b0771cbfe1e9d12cae27292dc7fe9d5502 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Mon, 29 Jul 2013 08:46:55 +0000
Subject: [PATCH] make cancelling requests and clearing cache part of
 appPanel.reload

---
 static/js/appPanel.js | 2 ++
 static/js/mainMenu.js | 1 -
 static/js/utils.js    | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/static/js/appPanel.js b/static/js/appPanel.js
index 560e9be1..a6a17182 100644
--- a/static/js/appPanel.js
+++ b/static/js/appPanel.js
@@ -26,6 +26,8 @@ pandora.ui.appPanel = function() {
         return that;
     };
     that.reload = function() {
+        Ox.Request.cancel();
+        Ox.Request.clearCache();
         pandora.$ui.appPanel.remove();
         pandora.$ui.appPanel = pandora.ui.appPanel().appendTo(pandora.$ui.body);
         return that;
diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js
index a234a040..e03fd7c8 100644
--- a/static/js/mainMenu.js
+++ b/static/js/mainMenu.js
@@ -421,7 +421,6 @@ pandora.ui.mainMenu = function() {
                 } else if (data.id == 'clearcache') {
                     Ox.Request.clearCache();
                 } else if (data.id == 'reloadapplication') {
-                    Ox.Request.clearCache();
                     pandora.$ui.appPanel.reload();
                 } else if (data.id == 'debugmode') {
                     if (pandora.localStorage('enableDebugMode')) {
diff --git a/static/js/utils.js b/static/js/utils.js
index 77f43ec6..073f10d0 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -1540,7 +1540,6 @@ pandora.signin = function(data) {
     pandora.URL.init();
     pandora.URL.update();
     Ox.Theme(pandora.user.ui.theme);
-    Ox.Request.clearCache();
     pandora.$ui.appPanel.reload();
 };
 
@@ -1554,7 +1553,6 @@ pandora.signout = function(data) {
     pandora.URL.init();
     pandora.URL.update();
     Ox.Theme(pandora.user.ui.theme);
-    Ox.Request.clearCache();
     pandora.$ui.appPanel.reload();
 };