refs #3359 moving ajax requests to a new ajax helper with more functionality as the old functions

git-svn-id: http://dev.piwik.org/svn/trunk@7489 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 41 insertions, 33 deletions

diff --git a/plugins/Overlay/templates/index.js b/plugins/Overlay/templates/index.js
index 45ec759d42..3cdc985deb 100644
--- a/plugins/Overlay/templates/index.js
+++ b/plugins/Overlay/templates/index.js
@@ -31,39 +31,47 @@ var Piwik_Overlay = (function() {
 		iframeCurrentPage = currentUrl;
 		iframeDomain = currentUrl.match(/http(s)?:\/\/(www\.)?([^\/]*)/i)[3];
 
-		piwikHelper.abortQueueAjax();
-		piwikHelper.ajaxCall('Overlay', 'renderSidebar', {
-			currentUrl: currentUrl
-		}, function(response) {
-			hideLoading();
-
-			var $response = $(response);
-
-			var $responseLocation = $response.find('.Overlay_Location');
-			var $url = $responseLocation.find('span');
-			iframeCurrentPageNormalized = $url.data('normalizedUrl');
-			iframeCurrentActionLabel = $url.data('label');
-			$url.html(piwikHelper.addBreakpointsToUrl($url.text()));
-			$location.html($responseLocation.html()).show();
-			$responseLocation.remove();
-
-			$location.find('span').hover(function() {
-				if (iframeDomain) {
-					// use addBreakpointsToUrl because it also encoded html entities
-					Piwik_Tooltip.show('<b>' + Piwik_Overlay_Translations.domain + ':</b> ' +
-						piwikHelper.addBreakpointsToUrl(iframeDomain), 'Overlay_Tooltip');
-				}
-			}, function() {
-				Piwik_Tooltip.hide();
-			});
-
-			$sidebar.empty().append($response).show();
-
-			if ($sidebar.find('.Overlay_NoData').size() == 0) {
-				$rowEvolutionLink.show();
-				$transitionsLink.show()
-			}
-		}, 'html');
+        globalAjaxQueue.abort();
+        var ajaxRequest = new ajaxHelper();
+        ajaxRequest.addParams({
+            module:     'Overlay',
+            action:     'renderSidebar',
+            currentUrl: currentUrl
+        }, 'get');
+        ajaxRequest.setCallback(
+            function (response) {
+                hideLoading();
+
+                var $response = $(response);
+
+                var $responseLocation = $response.find('.Overlay_Location');
+                var $url = $responseLocation.find('span');
+                iframeCurrentPageNormalized = $url.data('normalizedUrl');
+                iframeCurrentActionLabel = $url.data('label');
+                $url.html(piwikHelper.addBreakpointsToUrl($url.text()));
+                $location.html($responseLocation.html()).show();
+                $responseLocation.remove();
+
+                $location.find('span').hover(function () {
+                    if (iframeDomain) {
+                        // use addBreakpointsToUrl because it also encoded html entities
+                        Piwik_Tooltip.show('<b>' + Piwik_Overlay_Translations.domain + ':</b> ' +
+                            piwikHelper.addBreakpointsToUrl(iframeDomain), 'Overlay_Tooltip');
+                    }
+                }, function () {
+                    Piwik_Tooltip.hide();
+                });
+
+                $sidebar.empty().append($response).show();
+
+                if ($sidebar.find('.Overlay_NoData').size() == 0) {
+                    $rowEvolutionLink.show();
+                    $transitionsLink.show()
+                }
+            }
+        );
+        ajaxRequest.setFormat('html');
+        ajaxRequest.send(false);
 	}
 
 	/** Adjust the dimensions of the iframe */