summaryrefslogtreecommitdiff
path: root/widgets.js
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2013-04-25 18:36:21 +0200
committerjmoenig <jens@moenig.org>2013-04-25 18:36:21 +0200
commit25f813f79ecf367829ce20998d610c426afac07c (patch)
tree9ea3b647e877a58ac4a2b5badf3447a91ce99ebe /widgets.js
parent4580aa1e0d58b4f7f5aa27f5360416d6cc4697d8 (diff)
downloadsnap-25f813f79ecf367829ce20998d610c426afac07c.tar.gz
snap-25f813f79ecf367829ce20998d610c426afac07c.zip
Restore multi-dialog restrictions for multi-world setups
Diffstat (limited to 'widgets.js')
-rw-r--r--widgets.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/widgets.js b/widgets.js
index 4c720a9..a2e4582 100644
--- a/widgets.js
+++ b/widgets.js
@@ -2043,10 +2043,15 @@ DialogBoxMorph.prototype.withKey = function (key) {
DialogBoxMorph.prototype.popUp = function (world) {
if (world) {
if (this.key) {
- if (this.instances[this.key]) {
- this.instances[this.key].destroy();
+ if (this.instances[world.stamp]) {
+ if (this.instances[world.stamp][this.key]) {
+ this.instances[world.stamp][this.key].destroy();
+ }
+ this.instances[world.stamp][this.key] = this;
+ } else {
+ this.instances[world.stamp] = {};
+ this.instances[world.stamp][this.key] = this;
}
- this.instances[this.key] = this;
}
world.add(this);
world.keyboardReceiver = this;