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

Commit 9c0659c

Browse files
committed
refactor($http): move functions together and order alphabetically
Closes #14921
1 parent 3b9963c commit 9c0659c

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

src/ng/http.js

+32-32
Original file line numberDiff line numberDiff line change
@@ -957,28 +957,7 @@ function $HttpProvider() {
957957
config.headers = mergeHeaders(requestConfig);
958958
config.method = uppercase(config.method);
959959
config.paramSerializer = isString(config.paramSerializer) ?
960-
$injector.get(config.paramSerializer) : config.paramSerializer;
961-
962-
var serverRequest = function(config) {
963-
var headers = config.headers;
964-
var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
965-
966-
// strip content-type if data is undefined
967-
if (isUndefined(reqData)) {
968-
forEach(headers, function(value, header) {
969-
if (lowercase(header) === 'content-type') {
970-
delete headers[header];
971-
}
972-
});
973-
}
974-
975-
if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
976-
config.withCredentials = defaults.withCredentials;
977-
}
978-
979-
// send request
980-
return sendReq(config, reqData).then(transformResponse, transformResponse);
981-
};
960+
$injector.get(config.paramSerializer) : config.paramSerializer;
982961

983962
var chain = [serverRequest, undefined];
984963
var promise = $q.when(config);
@@ -1025,16 +1004,6 @@ function $HttpProvider() {
10251004

10261005
return promise;
10271006

1028-
function transformResponse(response) {
1029-
// make a copy since the response must be cacheable
1030-
var resp = extend({}, response);
1031-
resp.data = transformData(response.data, response.headers, response.status,
1032-
config.transformResponse);
1033-
return (isSuccess(response.status))
1034-
? resp
1035-
: $q.reject(resp);
1036-
}
1037-
10381007
function executeHeaderFns(headers, config) {
10391008
var headerContent, processedHeaders = {};
10401009

@@ -1076,6 +1045,37 @@ function $HttpProvider() {
10761045
// execute if header value is a function for merged headers
10771046
return executeHeaderFns(reqHeaders, shallowCopy(config));
10781047
}
1048+
1049+
function serverRequest(config) {
1050+
var headers = config.headers;
1051+
var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
1052+
1053+
// strip content-type if data is undefined
1054+
if (isUndefined(reqData)) {
1055+
forEach(headers, function(value, header) {
1056+
if (lowercase(header) === 'content-type') {
1057+
delete headers[header];
1058+
}
1059+
});
1060+
}
1061+
1062+
if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
1063+
config.withCredentials = defaults.withCredentials;
1064+
}
1065+
1066+
// send request
1067+
return sendReq(config, reqData).then(transformResponse, transformResponse);
1068+
}
1069+
1070+
function transformResponse(response) {
1071+
// make a copy since the response must be cacheable
1072+
var resp = extend({}, response);
1073+
resp.data = transformData(response.data, response.headers, response.status,
1074+
config.transformResponse);
1075+
return (isSuccess(response.status))
1076+
? resp
1077+
: $q.reject(resp);
1078+
}
10791079
}
10801080

10811081
$http.pendingRequests = [];

0 commit comments

Comments
 (0)