remove lingering trailing whitespace from rebase merge

loopbackio · Mar 2, 2015 · 6116b2c · 6116b2c
1 parent 04746e7
commit 6116b2c
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/lib/relation-definition.js b/lib/relation-definition.js
@@ -735,7 +735,7 @@ HasMany.prototype.findById = function (fkId, cb) {
   filter.where = {};
   filter.where[idName] = fkId;
   filter.where[fk] = modelInstance[pk];
-  
+
   cb = cb || utils.createPromiseCallback();
 
   if (filter.where[fk] === undefined) {
@@ -999,7 +999,7 @@ HasManyThrough.prototype.add = function (acInst, data, done) {
     data = {};
   }
   var query = {};
-  
+
   data = data || {};
   done = done || utils.createPromiseCallback();
 
@@ -1058,7 +1058,7 @@ HasManyThrough.prototype.exists = function (acInst, done) {
   var filter = { where: query };
 
   definition.applyScope(this.modelInstance, filter);
-  
+
   done = done || utils.createPromiseCallback();
 
   modelThrough.count(filter.where, function(err, ac) {
@@ -1092,7 +1092,7 @@ HasManyThrough.prototype.remove = function (acInst, done) {
   var filter = { where: query };
 
   definition.applyScope(this.modelInstance, filter);
-  
+
   done = done || utils.createPromiseCallback();
 
   modelThrough.deleteAll(filter.where, function (err) {
@@ -1226,7 +1226,7 @@ BelongsTo.prototype.create = function(targetModelData, cb) {
     targetModelData = {};
   }
   cb = cb || utils.createPromiseCallback();
-  
+
   this.definition.applyProperties(modelInstance, targetModelData || {});
 
   modelTo.create(targetModelData, function(err, targetModel) {
@@ -1929,7 +1929,7 @@ EmbedsOne.prototype.create = function (targetModelData, cb) {
 
   targetModelData = targetModelData || {};
   cb = cb || utils.createPromiseCallback();
-  
+
   var inst = this.callScopeMethod('build', targetModelData);
 
   var updateEmbedded = function() {
@@ -2389,7 +2389,7 @@ EmbedsMany.prototype.create = function (targetModelData, cb) {
   }
   targetModelData = targetModelData || {};
   cb = cb || utils.createPromiseCallback();
-  
+
   var embeddedList = this.embeddedList();
 
   var inst = this.callScopeMethod('build', targetModelData);
@@ -2476,7 +2476,7 @@ EmbedsMany.prototype.add = function (acInst, data, cb) {
     data = {};
   }
   cb = cb || utils.createPromiseCallback();
-  
+
   var self = this;
   var definition = this.definition;
   var modelTo = this.definition.modelTo;
@@ -2541,7 +2541,7 @@ EmbedsMany.prototype.remove = function (acInst, cb) {
   var filter = { where: query };
 
   belongsTo.applyScope(modelInstance, filter);
-  
+
   cb = cb || utils.createPromiseCallback();
 
   modelInstance[definition.name](filter, function(err, items) {
@@ -2669,7 +2669,7 @@ ReferencesMany.prototype.related = function(receiver, scopeParams, condOrRefresh
   } else {
     throw new Error('Method can be only called with one or two arguments');
   }
-  
+
   var ids = self[fk] || [];
 
   this.definition.applyScope(modelInstance, actualCond);
@@ -2698,7 +2698,7 @@ ReferencesMany.prototype.findById = function (fkId, cb) {
   var filter = {};
 
   this.definition.applyScope(modelInstance, filter);
-  
+
   cb = cb || utils.createPromiseCallback();
 
   modelTo.findByIds(ids, filter, function (err, instances) {
@@ -2747,7 +2747,7 @@ ReferencesMany.prototype.updateById = function (fkId, data, cb) {
     data = {};
   }
   cb = cb || utils.createPromiseCallback();
-  
+
   this.findById(fkId, function(err, inst) {
     if (err) return cb(err);
     inst.updateAttributes(data, cb);
@@ -2790,7 +2790,7 @@ ReferencesMany.prototype.create = function (targetModelData, cb) {
   }
   targetModelData = targetModelData || {};
   cb = cb || utils.createPromiseCallback();
-  
+
   var ids = modelInstance[fk] || [];
 
   var inst = this.callScopeMethod('build', targetModelData);
@@ -2859,7 +2859,7 @@ ReferencesMany.prototype.add = function (acInst, cb) {
       done(err, err ? null : inst);
     });
   };
-  
+
   cb = cb || utils.createPromiseCallback();
 
   if (acInst instanceof modelTo) {
@@ -2895,7 +2895,7 @@ ReferencesMany.prototype.remove = function (acInst, cb) {
 
   var id = (acInst instanceof definition.modelTo) ? acInst[pk] : acInst;
   id = id.toString();
-  
+
   cb = cb || utils.createPromiseCallback();
 
   var index = currentIds.indexOf(id);