Commit d2fd984c authored by Vanessa's avatar Vanessa

add ajax loading image

parent d1c94cc7
...@@ -192,13 +192,14 @@ ...@@ -192,13 +192,14 @@
}; };
if (confirm("${confirmInitLabel}")) { if (confirm("${confirmInitLabel}")) {
$("#tip").html("<img src='${staticServePath}/images/loading.gif'/> loading...")
$.ajax({ $.ajax({
url: "${contextPath}/init", url: "${contextPath}/init",
type: "POST", type: "POST",
data: JSON.stringify(requestJSONObject), data: JSON.stringify(requestJSONObject),
success: function(result, textStatus) { success: function(result, textStatus) {
if (!result.sc) { if (!result.sc) {
alert(result.msg); $("#tip").text(result.msg);;
return; return;
} }
......
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
if (!/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test($("#userEmail" + status).val())) { if (!/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test($("#userEmail" + status).val())) {
$("#tip").text("${mailInvalidLabel}"); $("#tip").text("${mailInvalidLabel}");
$("#userEmail").focus(); $("#userEmail").focus();
return; //return;
} }
if ($("#userPassword").val().replace(/\s/g, "") === "") { if ($("#userPassword").val().replace(/\s/g, "") === "") {
$("#tip").text("${passwordEmptyLabel}"); $("#tip").text("${passwordEmptyLabel}");
$("#userPassword").focus(); $("#userPassword").focus();
return; //return;
} }
var requestJSONObject = { var requestJSONObject = {
...@@ -95,6 +95,8 @@ ...@@ -95,6 +95,8 @@
"userPassword": $("#userPassword").val() "userPassword": $("#userPassword").val()
}; };
$("#tip").html("<img src='${staticServePath}/images/loading.gif'/> loading...")
$.ajax({ $.ajax({
url: "${servePath}/login", url: "${servePath}/login",
type: "POST", type: "POST",
......
...@@ -96,6 +96,8 @@ ...@@ -96,6 +96,8 @@
"userURL": $("#userURL").val(), "userURL": $("#userURL").val(),
"userPassword": $("#userPassword").val() "userPassword": $("#userPassword").val()
}; };
$("#tip").html("<img src='${staticServePath}/images/loading.gif'/> loading...")
$.ajax({ $.ajax({
url: "${contextPath}" + "/console/user/", url: "${contextPath}" + "/console/user/",
type: "POST", type: "POST",
......
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
"userEmail": $("#userEmail").val() "userEmail": $("#userEmail").val()
}; };
$("#tip").html("<img src='${staticServePath}/images/loading.gif'/> loading...")
$.ajax({ $.ajax({
url: "${servePath}/forgot", url: "${servePath}/forgot",
type: "POST", type: "POST",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment