From f5a0c36b959c081ea59d1392ae70e9bfd6f22667 Mon Sep 17 00:00:00 2001 From: Harry Brundage Date: Wed, 11 Jul 2012 11:51:04 -0400 Subject: [PATCH] Remove a relic mutex surrounding hasMany association encoding --- lib/batman.js | 5 ----- lib/dist/batman.node.js | 5 ----- src/model/associations/has_many_association.coffee | 3 --- 3 files changed, 13 deletions(-) diff --git a/lib/batman.js b/lib/batman.js index cdaf9932..e7856024 100644 --- a/lib/batman.js +++ b/lib/batman.js @@ -10040,10 +10040,6 @@ return { encode: function(relationSet, _, __, record) { var jsonArray; - if (association._beingEncoded) { - return; - } - association._beingEncoded = true; if (!association.options.saveInline) { return; } @@ -10058,7 +10054,6 @@ return jsonArray.push(relationJSON); }); } - delete association._beingEncoded; return jsonArray; }, decode: function(data, key, _, __, parentRecord) { diff --git a/lib/dist/batman.node.js b/lib/dist/batman.node.js index 7d01abf8..5629f53d 100644 --- a/lib/dist/batman.node.js +++ b/lib/dist/batman.node.js @@ -10040,10 +10040,6 @@ return { encode: function(relationSet, _, __, record) { var jsonArray; - if (association._beingEncoded) { - return; - } - association._beingEncoded = true; if (!association.options.saveInline) { return; } @@ -10058,7 +10054,6 @@ return jsonArray.push(relationJSON); }); } - delete association._beingEncoded; return jsonArray; }, decode: function(data, key, _, __, parentRecord) { diff --git a/src/model/associations/has_many_association.coffee b/src/model/associations/has_many_association.coffee index f9fa9495..1df6a166 100644 --- a/src/model/associations/has_many_association.coffee +++ b/src/model/associations/has_many_association.coffee @@ -22,8 +22,6 @@ class Batman.HasManyAssociation extends Batman.PluralAssociation association = @ return { encode: (relationSet, _, __, record) -> - return if association._beingEncoded - association._beingEncoded = true return unless association.options.saveInline if relationSet? jsonArray = [] @@ -33,7 +31,6 @@ class Batman.HasManyAssociation extends Batman.PluralAssociation relationJSON[association.foreignKey] = record.get(association.primaryKey) jsonArray.push relationJSON - delete association._beingEncoded jsonArray decode: (data, key, _, __, parentRecord) ->