kopia lustrzana https://github.com/backface/turtlestitch
rodzic
b5ddbfbc75
commit
6c07875d04
7
cloud.js
7
cloud.js
|
@ -29,7 +29,7 @@
|
|||
|
||||
/*global modules, IDE_Morph, SnapSerializer, hex_sha512, alert, nop*/
|
||||
|
||||
modules.cloud = '2013-May-06';
|
||||
modules.cloud = '2013-May-10';
|
||||
|
||||
// Global stuff
|
||||
|
||||
|
@ -180,7 +180,6 @@ Cloud.prototype.getPublicProject = function (
|
|||
|
||||
Cloud.prototype.resetPassword = function (
|
||||
username,
|
||||
email,
|
||||
callBack,
|
||||
errorCall
|
||||
) {
|
||||
|
@ -193,9 +192,7 @@ Cloud.prototype.resetPassword = function (
|
|||
(this.hasProtocol() ? '' : 'http://')
|
||||
+ this.url + 'ResetPW'
|
||||
+ '&Username='
|
||||
+ encodeURIComponent(username)
|
||||
+ '&Email='
|
||||
+ email,
|
||||
+ encodeURIComponent(username),
|
||||
true
|
||||
);
|
||||
request.setRequestHeader(
|
||||
|
|
6
gui.js
6
gui.js
|
@ -68,7 +68,7 @@ sb, CommentMorph, CommandBlockMorph*/
|
|||
|
||||
// Global stuff ////////////////////////////////////////////////////////
|
||||
|
||||
modules.gui = '2013-May-06';
|
||||
modules.gui = '2013-May-10';
|
||||
|
||||
// Declarations
|
||||
|
||||
|
@ -3086,12 +3086,12 @@ IDE_Morph.prototype.resetCloudPassword = function () {
|
|||
function (user) {
|
||||
SnapCloud.resetPassword(
|
||||
user.username,
|
||||
user.email,
|
||||
function (txt, title) {
|
||||
new DialogBoxMorph().inform(
|
||||
title,
|
||||
txt +
|
||||
'.\n\nAn e-mail with your password\n' +
|
||||
'.\n\nAn e-mail with a link to\n' +
|
||||
'reset your password\n' +
|
||||
'has been sent to the address provided',
|
||||
world,
|
||||
myself.cloudIcon(null, new Color(0, 180, 0))
|
||||
|
|
|
@ -1695,4 +1695,8 @@ ______
|
|||
|
||||
130506
|
||||
------
|
||||
* Reset Password feature (frontend only)
|
||||
* Reset Password feature (frontend only)
|
||||
|
||||
130510
|
||||
------
|
||||
* Reset Password via e-mailed link (frontend only)
|
||||
|
|
14
widgets.js
14
widgets.js
|
@ -73,7 +73,7 @@ newCanvas, StringMorph, Morph, TextMorph, nop, detect, StringFieldMorph,
|
|||
HTMLCanvasElement, fontHeight, SymbolMorph, localize, SpeechBubbleMorph,
|
||||
ArrowMorph, MenuMorph, isString, isNil, SliderMorph*/
|
||||
|
||||
modules.widgets = '2013-May-06';
|
||||
modules.widgets = '2013-May-10';
|
||||
|
||||
var PushButtonMorph;
|
||||
var ToggleButtonMorph;
|
||||
|
@ -1827,9 +1827,6 @@ DialogBoxMorph.prototype.promptCredentials = function (
|
|||
if (purpose === 'resetPassword') {
|
||||
inp.add(labelText('User name:'));
|
||||
inp.add(usr);
|
||||
emlLabel = labelText('E-mail address:');
|
||||
inp.add(emlLabel);
|
||||
inp.add(eml);
|
||||
}
|
||||
|
||||
if (msg) {
|
||||
|
@ -1922,7 +1919,7 @@ DialogBoxMorph.prototype.promptCredentials = function (
|
|||
} else if (purpose === 'changePassword') {
|
||||
checklist = [opw, pw1, pw2];
|
||||
} else if (purpose === 'resetPassword') {
|
||||
checklist = [usr, eml];
|
||||
checklist = [usr];
|
||||
}
|
||||
|
||||
empty = detect(
|
||||
|
@ -1956,13 +1953,6 @@ DialogBoxMorph.prototype.promptCredentials = function (
|
|||
return false;
|
||||
}
|
||||
}
|
||||
if (purpose === 'resetPassword') {
|
||||
if (em.indexOf(' ') > -1 || em.indexOf('@') === -1
|
||||
|| em.indexOf('.') === -1) {
|
||||
indicate(eml, 'please provide a valid\nemail address');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (purpose === 'signup') {
|
||||
if (!agree) {
|
||||
indicate(chk, 'please agree to\nthe TOS');
|
||||
|
|
Ładowanie…
Reference in New Issue