aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/data
diff options
context:
space:
mode:
authorEric Guzman2012-02-16 14:20:40 -0800
committerEric Guzman2012-02-16 14:20:40 -0800
commit6960f62a84b946c92a59e5f5dc537a818f9f62b8 (patch)
tree49cbff3fdd8dab11846e5a278406915ec0ec1508 /node_modules/montage/data
parent82b1a273219f0ae3d119e156c7acccdbe478f441 (diff)
parent81942bd52f0713c9ff5d479ebd12fce577f45e45 (diff)
downloadninja-6960f62a84b946c92a59e5f5dc537a818f9f62b8.tar.gz
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'node_modules/montage/data')
-rwxr-xr-xnode_modules/montage/data/context.js5
1 files changed, 3 insertions, 2 deletions
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/
148 if (instance.context === null) { 148 if (instance.context === null) {
149 instance.context = this; 149 instance.context = this;
150 this._inserted.add(instance); 150 this._inserted.add(instance);
151 var self = this;
151 return this.initializeObject(instance, this).then(function(instance) { 152 return this.initializeObject(instance, this).then(function(instance) {
152 this._objectMap.set(instance.objectId, instance); 153 self._objectMap.set(instance.objectId, instance);
153 return Promise.ref(instance); 154 return Promise.ref(instance);
154 }.bind(this)); 155 });
155 } else if (instance.context !== this) { 156 } else if (instance.context !== this) {
156 throw Exception.initWithMessageTargetAndMethod("This instance is already inserted in another context.", this, "insert"); 157 throw Exception.initWithMessageTargetAndMethod("This instance is already inserted in another context.", this, "insert");
157 } 158 }