aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/data/context.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-16 11:30:33 -0800
committerJose Antonio Marquez2012-02-16 11:30:33 -0800
commit9fe5d98bf469036c856e28d71ad4160d630b4af4 (patch)
tree930a334bcda0c26ca02eaa33a1506d147e8691e1 /node_modules/montage/data/context.js
parent89b5e793ea88ef235b54b6e1d1c379698d3e612b (diff)
parent71619045b692015b0889a4f5c381c1dee9c056cd (diff)
downloadninja-9fe5d98bf469036c856e28d71ad4160d630b4af4.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'node_modules/montage/data/context.js')
-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 }