From d52aca45e0357b5597e13d9b74998abb75fabea5 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 16 Feb 2012 10:54:48 -0800 Subject: integrating the latest montage fixes for v0.6 into master Signed-off-by: Valerio Virgillito --- node_modules/montage/data/context.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'node_modules/montage/data') diff --git a/node_modules/montage/data/context.js b/node_modules/montage/data/context.js index 694198e3..ca992ff0 100755 --- a/node_modules/montage/data/context.js +++ b/node_modules/montage/data/context.js @@ -148,10 +148,11 @@ var Context = exports.Context = Montage.create(Store, /** @lends module:montage/ if (instance.context === null) { instance.context = this; this._inserted.add(instance); + var self = this; return this.initializeObject(instance, this).then(function(instance) { - this._objectMap.set(instance.objectId, instance); + self._objectMap.set(instance.objectId, instance); return Promise.ref(instance); - }.bind(this)); + }); } else if (instance.context !== this) { throw Exception.initWithMessageTargetAndMethod("This instance is already inserted in another context.", this, "insert"); } -- cgit v1.2.3