Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

refactor($http): avoid re-creating execHeaders function #10359

Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions src/ng/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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);
}
}

Expand Down