aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMisko Hevery2010-07-13 15:53:13 -0700
committerMisko Hevery2010-07-13 15:53:13 -0700
commit32361d03a147213747762e17d279639666ed85fb (patch)
tree53a8364a6779a89d50d1e09e588d5ac3cac1f3d1 /src
parentf084fd37dbc80d9701f417a726b4ac3232039d93 (diff)
parentac3c2736c786abe996acc3d01d857dd5f0b3328a (diff)
downloadangular.js-32361d03a147213747762e17d279639666ed85fb.tar.bz2
Changed cacheThanRetrieve to verifyCache(by Rob Spies)
Diffstat (limited to 'src')
-rw-r--r--src/Resource.js11
-rw-r--r--src/services.js4
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Resource.js b/src/Resource.js
index 6ee0b1cf..1279dc54 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -1,3 +1,5 @@
+
+
function Route(template, defaults) {
this.template = template = template + '#';
this.defaults = defaults || {};
@@ -86,16 +88,15 @@ ResourceFactory.prototype = {
throw "Expected between 0-3 arguments [params, data, callback], got " + arguments.length + " arguments.";
}
- var value = action.isArray ? [] : new Resource(data);
+ var value = action.isArray ? [] : new Resource(data)
self.xhr(
action.method,
route.url(extend({}, action.params || {}, extractParams(data), params)),
data,
- function(status, response) {
+ function(status, response, clear) {
if (status == 200) {
if (action.isArray) {
- if (action.cacheThenRetrieve)
- value = [];
+ value.length = 0;
foreach(response, function(item){
value.push(new Resource(item));
});
@@ -107,7 +108,7 @@ ResourceFactory.prototype = {
throw {status: status, response:response, message: status + ": " + response};
}
},
- action.cacheThenRetrieve
+ action.verifyCache
);
return value;
};
diff --git a/src/services.js b/src/services.js
index 64f2ea4f..ed6f73ad 100644
--- a/src/services.js
+++ b/src/services.js
@@ -313,7 +313,7 @@ angularService('$xhr.bulk', function($xhr, $error, $log){
angularService('$xhr.cache', function($xhr){
var inflight = {}, self = this;;
- function cache(method, url, post, callback, cacheThenRetrieve){
+ function cache(method, url, post, callback, verifyCache){
if (isFunction(post)) {
callback = post;
post = null;
@@ -322,7 +322,7 @@ angularService('$xhr.cache', function($xhr){
var data;
if (data = cache.data[url]) {
callback(200, copy(data.value));
- if (!cacheThenRetrieve)
+ if (!verifyCache)
return;
}