Renamed all methods called delete to remove
This is because Internet Explorer <= 8 has `delete` as a reserved keyword that you cannot name your methods
This commit is contained in:
@@ -97,7 +97,7 @@ my.__type__ = 'couchdb';
|
|||||||
//
|
//
|
||||||
// @param {Object} id id of object to delete
|
// @param {Object} id id of object to delete
|
||||||
// @return deferred supporting promise API
|
// @return deferred supporting promise API
|
||||||
this.delete = function(_id) {
|
this.remove = function(_id) {
|
||||||
url = self.endpoint;
|
url = self.endpoint;
|
||||||
url += '/' + _id;
|
url += '/' + _id;
|
||||||
return self._makeRequest({
|
return self._makeRequest({
|
||||||
@@ -475,7 +475,7 @@ _deleteDocument = function (del_doc, dataset) {
|
|||||||
var cdb = new my.CouchDBWrapper(db_url, view_url);
|
var cdb = new my.CouchDBWrapper(db_url, view_url);
|
||||||
|
|
||||||
if (view_url.search('_all_docs') !== -1)
|
if (view_url.search('_all_docs') !== -1)
|
||||||
return cdb.delete(_id);
|
return cdb.remove(_id);
|
||||||
else {
|
else {
|
||||||
_id = model.get('_id').split('__')[0];
|
_id = model.get('_id').split('__')[0];
|
||||||
var jqxhr = cdb.get(_id);
|
var jqxhr = cdb.get(_id);
|
||||||
@@ -484,7 +484,7 @@ _deleteDocument = function (del_doc, dataset) {
|
|||||||
if (dataset.record_delete)
|
if (dataset.record_delete)
|
||||||
old_doc = dataset.record_delete(del_doc, old_doc);
|
old_doc = dataset.record_delete(del_doc, old_doc);
|
||||||
if (_.isNull(del_doc))
|
if (_.isNull(del_doc))
|
||||||
dfd.resolve(cdb.delete(_id)); // XXX is this the right thing to do?
|
dfd.resolve(cdb.remove(_id)); // XXX is this the right thing to do?
|
||||||
else {
|
else {
|
||||||
// couchdb uses _id to identify documents, Backbone models use id.
|
// couchdb uses _id to identify documents, Backbone models use id.
|
||||||
// we should remove it before sending it to the server.
|
// we should remove it before sending it to the server.
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
|
|||||||
//
|
//
|
||||||
// @param {Object} id id of object to delete
|
// @param {Object} id id of object to delete
|
||||||
// @return deferred supporting promise API
|
// @return deferred supporting promise API
|
||||||
this.delete = function(id) {
|
this.remove = function(id) {
|
||||||
url = this.endpoint;
|
url = this.endpoint;
|
||||||
url += '/' + id;
|
url += '/' + id;
|
||||||
return makeRequest({
|
return makeRequest({
|
||||||
@@ -219,7 +219,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
|
|||||||
else if (changes.updates.length >0) {
|
else if (changes.updates.length >0) {
|
||||||
return es.upsert(changes.updates[0]);
|
return es.upsert(changes.updates[0]);
|
||||||
} else if (changes.deletes.length > 0) {
|
} else if (changes.deletes.length > 0) {
|
||||||
return es.delete(changes.deletes[0].id);
|
return es.remove(changes.deletes[0].id);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.delete = function(doc) {
|
this.remove = function(doc) {
|
||||||
var newdocs = _.reject(self.data, function(internalDoc) {
|
var newdocs = _.reject(self.data, function(internalDoc) {
|
||||||
return (doc.id === internalDoc.id);
|
return (doc.id === internalDoc.id);
|
||||||
});
|
});
|
||||||
@@ -52,7 +52,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
|
|||||||
self.update(record);
|
self.update(record);
|
||||||
});
|
});
|
||||||
_.each(changes.deletes, function(record) {
|
_.each(changes.deletes, function(record) {
|
||||||
self.delete(record);
|
self.remove(record);
|
||||||
});
|
});
|
||||||
dfd.resolve();
|
dfd.resolve();
|
||||||
return dfd.promise();
|
return dfd.promise();
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ test("write", function() {
|
|||||||
equal(data._version, 2);
|
equal(data._version, 2);
|
||||||
|
|
||||||
// delete
|
// delete
|
||||||
var jqxhr = backend.delete(rec.id);
|
var jqxhr = backend.remove(rec.id);
|
||||||
jqxhr.done(function(data) {
|
jqxhr.done(function(data) {
|
||||||
ok(data.ok);
|
ok(data.ok);
|
||||||
rec = null;
|
rec = null;
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ test('update and delete', function () {
|
|||||||
equal(data.data[0].x, newVal);
|
equal(data.data[0].x, newVal);
|
||||||
|
|
||||||
// Test Delete
|
// Test Delete
|
||||||
data.delete(doc1);
|
data.remove(doc1);
|
||||||
equal(data.data.length, 5);
|
equal(data.data.length, 5);
|
||||||
equal(data.data[0].x, memoryData[1].x);
|
equal(data.data[0].x, memoryData[1].x);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user