From 1d931b92398f31cf97610aa252cea12f5c3596ba Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Tue, 2 Oct 2012 14:10:25 +0100
Subject: [PATCH] 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
---
 src/backend.couchdb.js             | 6 +++---
 src/backend.elasticsearch.js       | 4 ++--
 src/backend.memory.js              | 4 ++--
 test/backend.elasticsearch.test.js | 2 +-
 test/backend.memory.test.js        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/backend.couchdb.js b/src/backend.couchdb.js
index 54f3f88a..1691f756 100755
--- a/src/backend.couchdb.js
+++ b/src/backend.couchdb.js
@@ -97,7 +97,7 @@ my.__type__ = 'couchdb';
     //
     // @param {Object} id id of object to delete
     // @return deferred supporting promise API
-    this.delete = function(_id) {
+    this.remove = function(_id) {
       url = self.endpoint;
       url += '/' + _id;
       return self._makeRequest({
@@ -475,7 +475,7 @@ _deleteDocument = function (del_doc, dataset) {
   var cdb      = new my.CouchDBWrapper(db_url, view_url);
 
   if (view_url.search('_all_docs') !== -1) 
-    return cdb.delete(_id);
+    return cdb.remove(_id);
   else {
     _id = model.get('_id').split('__')[0];
     var jqxhr = cdb.get(_id);
@@ -484,7 +484,7 @@ _deleteDocument = function (del_doc, dataset) {
       if (dataset.record_delete)
         old_doc = dataset.record_delete(del_doc, old_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 {
         // couchdb uses _id to identify documents, Backbone models use id.
         // we should remove it before sending it to the server.
diff --git a/src/backend.elasticsearch.js b/src/backend.elasticsearch.js
index 1c01c534..dc2d8f06 100644
--- a/src/backend.elasticsearch.js
+++ b/src/backend.elasticsearch.js
@@ -79,7 +79,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
     //
     // @param {Object} id id of object to delete
     // @return deferred supporting promise API
-    this.delete = function(id) {
+    this.remove = function(id) {
       url = this.endpoint;
       url += '/' + id;
       return makeRequest({
@@ -219,7 +219,7 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
     else if (changes.updates.length >0) {
       return es.upsert(changes.updates[0]);
     } else if (changes.deletes.length > 0) {
-      return es.delete(changes.deletes[0].id);
+      return es.remove(changes.deletes[0].id);
     }
   };
 
diff --git a/src/backend.memory.js b/src/backend.memory.js
index ece95bd2..539db80c 100644
--- a/src/backend.memory.js
+++ b/src/backend.memory.js
@@ -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) {
         return (doc.id === internalDoc.id);
       });
@@ -52,7 +52,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
         self.update(record);
       });
       _.each(changes.deletes, function(record) {
-        self.delete(record);
+        self.remove(record);
       });
       dfd.resolve();
       return dfd.promise();
diff --git a/test/backend.elasticsearch.test.js b/test/backend.elasticsearch.test.js
index 518227ff..f2c35d92 100644
--- a/test/backend.elasticsearch.test.js
+++ b/test/backend.elasticsearch.test.js
@@ -220,7 +220,7 @@ test("write", function() {
       equal(data._version, 2);
 
       // delete
-      var jqxhr = backend.delete(rec.id);
+      var jqxhr = backend.remove(rec.id);
       jqxhr.done(function(data) {
         ok(data.ok);
         rec = null;
diff --git a/test/backend.memory.test.js b/test/backend.memory.test.js
index 3c858206..ee39a485 100644
--- a/test/backend.memory.test.js
+++ b/test/backend.memory.test.js
@@ -135,7 +135,7 @@ test('update and delete', function () {
   equal(data.data[0].x, newVal);
 
   // Test Delete
-  data.delete(doc1);
+  data.remove(doc1);
   equal(data.data.length, 5);
   equal(data.data[0].x, memoryData[1].x);
 });