mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-23 01:40:25 +00:00
feat($http): add a default content type for PATH requests
The default header is now application/json which while not perfect in all cases is better than the browser default application/xml. The new headers also makes for better compatibility with Rails 4
This commit is contained in:
parent
1f99c3a521
commit
f9b897de4b
2 changed files with 17 additions and 6 deletions
|
|
@ -123,7 +123,8 @@ function isSuccess(status) {
|
|||
function $HttpProvider() {
|
||||
var JSON_START = /^\s*(\[|\{[^\{])/,
|
||||
JSON_END = /[\}\]]\s*$/,
|
||||
PROTECTION_PREFIX = /^\)\]\}',?\n/;
|
||||
PROTECTION_PREFIX = /^\)\]\}',?\n/,
|
||||
CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': 'application/json;charset=utf-8'};
|
||||
|
||||
var defaults = this.defaults = {
|
||||
// transform incoming response data
|
||||
|
|
@ -147,8 +148,9 @@ function $HttpProvider() {
|
|||
common: {
|
||||
'Accept': 'application/json, text/plain, */*'
|
||||
},
|
||||
post: {'Content-Type': 'application/json;charset=utf-8'},
|
||||
put: {'Content-Type': 'application/json;charset=utf-8'}
|
||||
post: CONTENT_TYPE_APPLICATION_JSON,
|
||||
put: CONTENT_TYPE_APPLICATION_JSON,
|
||||
patch: CONTENT_TYPE_APPLICATION_JSON
|
||||
},
|
||||
|
||||
xsrfCookieName: 'XSRF-TOKEN',
|
||||
|
|
@ -340,7 +342,7 @@ function $HttpProvider() {
|
|||
*
|
||||
* A custom default cache built with $cacheFactory can be provided in $http.defaults.cache.
|
||||
* To skip it, set configuration property `cache` to `false`.
|
||||
*
|
||||
*
|
||||
*
|
||||
* # Interceptors
|
||||
*
|
||||
|
|
@ -873,8 +875,8 @@ function $HttpProvider() {
|
|||
|
||||
|
||||
if ((config.cache || defaults.cache) && config.cache !== false && config.method == 'GET') {
|
||||
cache = isObject(config.cache) ? config.cache
|
||||
: isObject(defaults.cache) ? defaults.cache
|
||||
cache = isObject(config.cache) ? config.cache
|
||||
: isObject(defaults.cache) ? defaults.cache
|
||||
: defaultCache;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -684,6 +684,15 @@ describe('$http', function() {
|
|||
$httpBackend.flush();
|
||||
});
|
||||
|
||||
it('should set default headers for PATCH request', function() {
|
||||
$httpBackend.expect('PATCH', '/url', 'messageBody', function(headers) {
|
||||
return headers['Accept'] == 'application/json, text/plain, */*' &&
|
||||
headers['Content-Type'] == 'application/json;charset=utf-8';
|
||||
}).respond('');
|
||||
|
||||
$http({url: '/url', method: 'PATCH', headers: {}, data: 'messageBody'});
|
||||
$httpBackend.flush();
|
||||
});
|
||||
|
||||
it('should set default headers for custom HTTP method', function() {
|
||||
$httpBackend.expect('FOO', '/url', undefined, function(headers) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue