diff options
Diffstat (limited to 'src/service')
| -rw-r--r-- | src/service/resource.js | 10 | ||||
| -rw-r--r-- | src/service/xhr.bulk.js | 11 | ||||
| -rw-r--r-- | src/service/xhr.cache.js | 18 | ||||
| -rw-r--r-- | src/service/xhr.js | 11 |
4 files changed, 30 insertions, 20 deletions
diff --git a/src/service/resource.js b/src/service/resource.js index f6e0be18..47b57645 100644 --- a/src/service/resource.js +++ b/src/service/resource.js @@ -147,9 +147,15 @@ * <pre> var User = $resource('/user/:userId', {userId:'@id'}); - User.get({userId:123}, function(u){ + User.get({userId:123}, function(u, responseHeaders){ u.abc = true; - u.$save(); + u.$save(function(u, responseHeaders) { + // Get an Object containing all response headers + var allHeaders = responseHeaders(); + + // Get a specific response header + u.newId = responseHeaders('Location'); + }); }); </pre> diff --git a/src/service/xhr.bulk.js b/src/service/xhr.bulk.js index d7fc7990..8d9e7a72 100644 --- a/src/service/xhr.bulk.js +++ b/src/service/xhr.bulk.js @@ -48,13 +48,14 @@ angularServiceInject('$xhr.bulk', function($xhr, $error, $log){ queue.requests = []; queue.callbacks = []; $xhr('POST', url, {requests: currentRequests}, - function(code, response) { + function(code, response, responseHeaders) { forEach(response, function(response, i) { try { if (response.status == 200) { - (currentRequests[i].success || noop)(response.status, response.response); + (currentRequests[i].success || noop) + (response.status, response.response, responseHeaders); } else if (isFunction(currentRequests[i].error)) { - currentRequests[i].error(response.status, response.response); + currentRequests[i].error(response.status, response.response, responseHeaders); } else { $error(currentRequests[i], response); } @@ -64,11 +65,11 @@ angularServiceInject('$xhr.bulk', function($xhr, $error, $log){ }); (success || noop)(); }, - function(code, response) { + function(code, response, responseHeaders) { forEach(currentRequests, function(request, i) { try { if (isFunction(request.error)) { - request.error(code, response); + request.error(code, response, responseHeaders); } else { $error(request, response); } diff --git a/src/service/xhr.cache.js b/src/service/xhr.cache.js index 256b936e..b3280101 100644 --- a/src/service/xhr.cache.js +++ b/src/service/xhr.cache.js @@ -22,8 +22,8 @@ * @param {string} method HTTP method. * @param {string} url Destination URL. * @param {(string|Object)=} post Request body. - * @param {function(number, (string|Object))} success Response success callback. - * @param {function(number, (string|Object))=} error Response error callback. + * @param {function(number, (string|Object), Function)} success Response success callback. + * @param {function(number, (string|Object), Function)} error Response error callback. * @param {boolean=} [verifyCache=false] If `true` then a result is immediately returned from cache * (if present) while a request is sent to the server for a fresh response that will update the * cached entry. The `success` function will be called when the response is received. @@ -55,9 +55,9 @@ angularServiceInject('$xhr.cache', function($xhr, $defer, $error, $log) { if (dataCached = cache.data[url]) { if (sync) { - success(200, copy(dataCached.value)); + success(200, copy(dataCached.value), copy(dataCached.headers)); } else { - $defer(function() { success(200, copy(dataCached.value)); }); + $defer(function() { success(200, copy(dataCached.value), copy(dataCached.headers)); }); } if (!verifyCache) @@ -70,20 +70,20 @@ angularServiceInject('$xhr.cache', function($xhr, $defer, $error, $log) { } else { inflight[url] = {successes: [success], errors: [error]}; cache.delegate(method, url, post, - function(status, response) { + function(status, response, responseHeaders) { if (status == 200) - cache.data[url] = {value: response}; + cache.data[url] = {value: response, headers: responseHeaders}; var successes = inflight[url].successes; delete inflight[url]; forEach(successes, function(success) { try { - (success||noop)(status, copy(response)); + (success||noop)(status, copy(response), responseHeaders); } catch(e) { $log.error(e); } }); }, - function(status, response) { + function(status, response, responseHeaders) { var errors = inflight[url].errors, successes = inflight[url].successes; delete inflight[url]; @@ -91,7 +91,7 @@ angularServiceInject('$xhr.cache', function($xhr, $defer, $error, $log) { forEach(errors, function(error, i) { try { if (isFunction(error)) { - error(status, copy(response)); + error(status, copy(response), copy(responseHeaders)); } else { $error( {method: method, url: url, data: post, success: successes[i]}, diff --git a/src/service/xhr.js b/src/service/xhr.js index 70fcd067..6bff6f04 100644 --- a/src/service/xhr.js +++ b/src/service/xhr.js @@ -96,7 +96,7 @@ * angular generated callback function. * @param {(string|Object)=} post Request content as either a string or an object to be stringified * as JSON before sent to the server. - * @param {function(number, (string|Object))} success A function to be called when the response is + * @param {function(number, (string|Object), Function)} success A function to be called when the response is * received. The success function will be called with: * * - {number} code [HTTP status code](http://en.wikipedia.org/wiki/List_of_HTTP_status_codes) of @@ -104,6 +104,9 @@ * {@link angular.service.$xhr.error} service (or custom error callback). * - {string|Object} response Response object as string or an Object if the response was in JSON * format. + * - {function(string=)} responseHeaders A function that when called with a {string} header name, + * returns the value of that header or null if it does not exist; when called without + * arguments, returns an object containing every response header * @param {function(number, (string|Object))} error A function to be called if the response code is * not 2xx.. Accepts the same arguments as success, above. * @@ -198,7 +201,7 @@ angularServiceInject('$xhr', function($browser, $error, $log, $updateView){ post = toJson(post); } - $browser.xhr(method, url, post, function(code, response){ + $browser.xhr(method, url, post, function(code, response, responseHeaders){ try { if (isString(response)) { if (response.match(/^\)\]\}',\n/)) response=response.substr(6); @@ -207,9 +210,9 @@ angularServiceInject('$xhr', function($browser, $error, $log, $updateView){ } } if (200 <= code && code < 300) { - success(code, response); + success(code, response, responseHeaders); } else if (isFunction(error)) { - error(code, response); + error(code, response, responseHeaders); } else { $error( {method: method, url: url, data: post, success: success}, |