From b1d309b8867b4fe6924649b9a34d844ca5626470 Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Sun, 7 Dec 2014 19:46:39 +0100 Subject: [PATCH] refactor($http): avoid re-creating execHeaders function The execHeaders function was being re-defined inside mergeHeaders function. Additionally it was mutating its arguments. --- src/ng/http.js | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/ng/http.js b/src/ng/http.js index 3a73a137c0e2..84c200ec10a9 100644 --- a/src/ng/http.js +++ b/src/ng/http.js @@ -823,6 +823,23 @@ function $HttpProvider() { : $q.reject(resp); } + function executeHeaderFns(headers) { + var headerContent, processedHeaders = {}; + + forEach(headers, function(headerFn, header) { + if (isFunction(headerFn)) { + headerContent = headerFn(); + if (headerContent != null) { + processedHeaders[header] = headerContent; + } + } else { + processedHeaders[header] = headerFn; + } + }); + + return processedHeaders; + } + function mergeHeaders(config) { var defHeaders = defaults.headers, reqHeaders = extend({}, config.headers), @@ -845,23 +862,7 @@ function $HttpProvider() { } // execute if header value is a function for merged headers - execHeaders(reqHeaders); - return reqHeaders; - - function execHeaders(headers) { - var headerContent; - - forEach(headers, function(headerFn, header) { - if (isFunction(headerFn)) { - headerContent = headerFn(); - if (headerContent != null) { - headers[header] = headerContent; - } else { - delete headers[header]; - } - } - }); - } + return executeHeaderFns(reqHeaders); } }