summaryrefslogtreecommitdiff
path: root/gui.js
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2013-04-24 15:11:27 +0200
committerjmoenig <jens@moenig.org>2013-04-24 15:11:27 +0200
commitd0878399fe0a85a05642a223dd4796badd212c5c (patch)
treed4716373f06d687db7d947d24bc4d50d8249deba /gui.js
parent6bafe43b8f131abc283d326a887b1ac105a05e80 (diff)
downloadsnap-d0878399fe0a85a05642a223dd4796badd212c5c.tar.gz
snap-d0878399fe0a85a05642a223dd4796badd212c5c.zip
Fine-tune multiple dialog instance handling
prevent multiple block editors on the same block definition, allow multiple dialogs on different objects, handle dialog instances in DialogBoxMorph.prototype
Diffstat (limited to 'gui.js')
-rw-r--r--gui.js13
1 files changed, 5 insertions, 8 deletions
diff --git a/gui.js b/gui.js
index 12897ad..8ac5234 100644
--- a/gui.js
+++ b/gui.js
@@ -68,7 +68,7 @@ sb, CommentMorph, CommandBlockMorph*/
// Global stuff ////////////////////////////////////////////////////////
-modules.gui = '2013-April-23';
+modules.gui = '2013-April-24';
// Declarations
@@ -3007,7 +3007,7 @@ IDE_Morph.prototype.initializeCloud = function () {
myself.cloudError()
);
}
- ).withKey('cloud').promptCredentials(
+ ).withKey('cloudlogin').promptCredentials(
'Sign in',
'login',
null,
@@ -3048,7 +3048,7 @@ IDE_Morph.prototype.createCloudAccount = function () {
myself.cloudError()
);
}
- ).withKey('cloud').promptCredentials(
+ ).withKey('cloudsignup').promptCredentials(
'Sign up',
'signup',
'http://snap.berkeley.edu/tos.html',
@@ -3078,7 +3078,7 @@ IDE_Morph.prototype.changeCloudPassword = function () {
myself.cloudError()
);
}
- ).withKey('cloud').promptCredentials(
+ ).withKey('cloudpassword').promptCredentials(
'Change Password',
'changePassword',
null,
@@ -3403,10 +3403,6 @@ ProjectDialogMorph.prototype = new DialogBoxMorph();
ProjectDialogMorph.prototype.constructor = ProjectDialogMorph;
ProjectDialogMorph.uber = DialogBoxMorph.prototype;
-// ProjectDialogMorph constants:
-
-ProjectDialogMorph.prototype.key = 'project';
-
// ProjectDialogMorph instance creation:
function ProjectDialogMorph(ide, label) {
@@ -3444,6 +3440,7 @@ ProjectDialogMorph.prototype.init = function (ide, task) {
// override inherited properites:
this.labelString = this.task === 'save' ? 'Save Project' : 'Open Project';
this.createLabel();
+ this.key = 'project' + task;
// build contents
this.buildContents();