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

Commit 5db6257

Browse files
gkalpakpetebacondarwin
authored andcommitted
refactor($http): move functions together and order alphabetically
Closes #14921
1 parent 4f6f2bc commit 5db6257

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 = initiateOutstandingRequest(config);
@@ -1036,16 +1015,6 @@ function $HttpProvider() {
10361015
$browser.$$completeOutstandingRequest(noop);
10371016
}
10381017

1039-
function transformResponse(response) {
1040-
// make a copy since the response must be cacheable
1041-
var resp = extend({}, response);
1042-
resp.data = transformData(response.data, response.headers, response.status,
1043-
config.transformResponse);
1044-
return (isSuccess(response.status))
1045-
? resp
1046-
: $q.reject(resp);
1047-
}
1048-
10491018
function executeHeaderFns(headers, config) {
10501019
var headerContent, processedHeaders = {};
10511020

@@ -1087,6 +1056,37 @@ function $HttpProvider() {
10871056
// execute if header value is a function for merged headers
10881057
return executeHeaderFns(reqHeaders, shallowCopy(config));
10891058
}
1059+
1060+
function serverRequest(config) {
1061+
var headers = config.headers;
1062+
var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
1063+
1064+
// strip content-type if data is undefined
1065+
if (isUndefined(reqData)) {
1066+
forEach(headers, function(value, header) {
1067+
if (lowercase(header) === 'content-type') {
1068+
delete headers[header];
1069+
}
1070+
});
1071+
}
1072+
1073+
if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
1074+
config.withCredentials = defaults.withCredentials;
1075+
}
1076+
1077+
// send request
1078+
return sendReq(config, reqData).then(transformResponse, transformResponse);
1079+
}
1080+
1081+
function transformResponse(response) {
1082+
// make a copy since the response must be cacheable
1083+
var resp = extend({}, response);
1084+
resp.data = transformData(response.data, response.headers, response.status,
1085+
config.transformResponse);
1086+
return (isSuccess(response.status))
1087+
? resp
1088+
: $q.reject(resp);
1089+
}
10901090
}
10911091

10921092
$http.pendingRequests = [];

0 commit comments

Comments
 (0)