projects
/
qomet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge forename + name into [identifying] 'name' (more general)
[qomet.git]
/
public
/
javascripts
/
login.js
diff --git
a/public/javascripts/login.js
b/public/javascripts/login.js
index
1bb5b72
..
4f70e19
100644
(file)
--- a/
public/javascripts/login.js
+++ b/
public/javascripts/login.js
@@
-25,7
+25,6
@@
window.onload = function() {
data: {
messages: messages,
user: {
data: {
messages: messages,
user: {
- forename: "",
name: "",
email: "",
},
name: "",
email: "",
},
@@
-52,7
+51,7
@@
window.onload = function() {
}
let error = Validator.checkObject({email: this.user.email}, "User");
if (!error && this.stage == "register")
}
let error = Validator.checkObject({email: this.user.email}, "User");
if (!error && this.stage == "register")
- error = Validator.checkObject({
forename: this.user.forename,
name: this.user.name}, "User");
+ error = Validator.checkObject({name: this.user.name}, "User");
let $dialog = $("#dialog");
show($dialog);
setTimeout(() => {hide($dialog);}, 3000);
let $dialog = $("#dialog");
show($dialog);
setTimeout(() => {hide($dialog);}, 3000);
@@
-65,14
+64,12
@@
window.onload = function() {
data:
{
email: encodeURIComponent(this.user.email),
data:
{
email: encodeURIComponent(this.user.email),
- forename: encodeURIComponent(this.user.forename), //may be unused
name: encodeURIComponent(this.user.name), //may be unused
},
dataType: "json",
success: res => {
if (!res.errmsg)
{
name: encodeURIComponent(this.user.name), //may be unused
},
dataType: "json",
success: res => {
if (!res.errmsg)
{
- this.user["forename"] = "";
this.user["name"] = "";
this.user["email"] = "";
showMsg($dialog, "info", infos[this.stage]);
this.user["name"] = "";
this.user["email"] = "";
showMsg($dialog, "info", infos[this.stage]);