sc-config @@ -197,28 +197,34 @@ SC.MerbDataSource = SC.DataSource.extend( { createRecordDidComplete: function(r, store, storeKey, id){ var c=this.get('cache'), dataHash, response, results, guid; + if(!this.canceledStoreKeys[storeKey]) return NO; dataHash = store.readDataHash(storeKey); response = r.response(); results = response.content; guid=results.guid; if(guid) c[guid]=results; store.dataSourceDidComplete(storeKey, results, guid); + return YES; }, updateRecordDidComplete: function(r, store, storeKey, id){ var c=this.get('cache'), dataHash, response, results, guid; + if(!this.canceledStoreKeys[storeKey]) return NO; dataHash = store.readDataHash(storeKey); response = r.response(); results = response.content; guid=results.guid; if(guid) c[guid]=results; store.dataSourceDidComplete(storeKey, results, guid); + return YES; }, destroyRecordDidComplete: function(r, store, storeKey, id){ var c=this.get('cache'); + if(!this.canceledStoreKeys[storeKey]) return NO; if (id) delete c[id]; store.dataSourceDidDestroy(storeKey); + return YES; }, storeResultInCache: function(dataHash, recordType, primaryKey) { @@ -238,11 +244,11 @@ SC.MerbDataSource = SC.DataSource.extend( { return "@id%@".fmt(SC.Store.generateStoreKey()); }, - removedStoreKeyFromCanceledKeys : function(storeKey){ + removedStoreKeyFromCanceled : function(storeKey){ delete this.canceledStoreKeys[storeKey]; }, - removedStoreKeysFromCanceledKeys : function(storeKeys){ + removedStoreKeysFromCanceled : function(storeKeys){ var i; for(i in storeKeys){ delete this.canceledStoreKeys[storeKeys[i]]; apps/todos/data_source/merb_data_source.js 9fc79b24bd1b8ea380ae4113b7ac02c7884b259c juanpin juanpin@mac.com http://github.com/sproutit/samples-todos/commit/aa980c3dcd78a14d6927db5d17c91e72698e0d95 aa980c3dcd78a14d6927db5d17c91e72698e0d95 2009-04-15T20:57:45-07:00 2009-04-15T20:57:45-07:00 add an sc-config for the proxy a349171be6a91d916c0574169bbee44a9d042933 juanpin juanpin@mac.com