Fixed model.remove ignoring callback

I don't know if this behavior was intended, but it's wrong. If I call .remove on the same model twice for whatever reason, second call will never execute callback, which will break execution flow.
slouffka · Nov 13, 2012 · 1ef516b · 1ef516b
1 parent 6eecdad
commit 1ef516b
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -661,9  661,7 @@ Model.prototype._where = function _where (where) {
  */
 
 Model.prototype.remove = function remove (fn) {
-  if (this._removing) return this;
-
-  var promise = this._removing = new Promise(fn)
   var promise = new Promise(fn)
     , where = this._where()
     , self = this
     , options = {}
@@ -675,7  673,7 @@ Model.prototype.remove = function remove (fn) {
   this.collection.remove(where, options, tick(function (err) {
     if (err) {
       promise.error(err);
-      promise = self = self._removing = where = options = null;
       promise = self = where = options = null;
       return;
     }
     self.emit('remove', self);