From 875e3b16717161b3a024a786dbd5f9aaf8fae73d Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Thu, 6 Aug 2015 09:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C=E5=AF=86=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=94=B9=E4=B8=BA=E4=BA=86=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=89=8D=E9=AA=8C=E8=AF=81=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=A7=E9=87=8F=E8=AF=B7=E6=B1=82=E3=80=82?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=B3=A8=E5=86=8C=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=90=91=E5=90=8E=E7=AB=AF=E5=8F=91=E9=80=81=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E5=AD=97=E6=AE=B5=E3=80=82=20=E6=95=B4=E7=90=86=20js?= =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/js/app/oj/account/change_password.js | 24 +++++------ static/src/js/app/oj/account/login.js | 12 +++--- static/src/js/app/oj/account/register.js | 42 +++++++++---------- 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/static/src/js/app/oj/account/change_password.js b/static/src/js/app/oj/account/change_password.js index e3e907f..c76dd9d 100644 --- a/static/src/js/app/oj/account/change_password.js +++ b/static/src/js/app/oj/account/change_password.js @@ -1,4 +1,4 @@ -require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrfHeader){ +require(["jquery", "bs_alert", "csrf", "validation"], function ($, bs_alert, csrfHeader) { $("#change_password-form").formValidation({ framework: "bootstrap", fields: { @@ -13,22 +13,22 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf validators: { notEmpty: { message: "请填写旧密码" - } + } } }, new_password: { validators: { notEmpty: { message: "请填写新密码" - }, + }, stringLength: { min: 6, max: 30, message: '密码长度必须在6到30位之间' } }, - onSuccess: function(e, data) { - data.fv.revalidateField('confirm_password'); + onSuccess: function (e, data) { + data.fv.revalidateField('confirm_password'); } }, confirm_password: { @@ -40,27 +40,27 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf original: $("#new_password"), message: "两次输入的密码必须一致" } - }, + } } } } - ).on('success.form.fv', function(e) { + ).on('success.form.fv', function (e) { e.preventDefault(); var username = $("#username").val(); - var new_password = $("#new_password ").val(); + var new_password = $("#new_password ").val(); var password = $("#password").val(); $.ajax({ beforeSend: csrfHeader, url: "/api/change_password/", - data: {username: username, new_password: new_password , old_password : password}, + data: {username: username, new_password: new_password, old_password: password}, dataType: "json", method: "post", success: function (data) { - if(!data.code){ - window.location.href="/login/"; + if (!data.code) { + window.location.href = "/login/"; } - else{ + else { bs_alert(data.data); } } diff --git a/static/src/js/app/oj/account/login.js b/static/src/js/app/oj/account/login.js index da4416d..2ecebf7 100644 --- a/static/src/js/app/oj/account/login.js +++ b/static/src/js/app/oj/account/login.js @@ -1,6 +1,6 @@ -require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrfHeader){ +require(["jquery", "bs_alert", "csrf", "validation"], function ($, bs_alert, csrfHeader) { $("#login-form") - .formValidation({ + .formValidation({ framework: "bootstrap", fields: { username: { @@ -19,7 +19,7 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf } } } - ).on('success.form.fv', function(e) { + ).on('success.form.fv', function (e) { e.preventDefault(); var username = $("#username").val(); var password = $("#password").val(); @@ -30,10 +30,10 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf dataType: "json", method: "post", success: function (data) { - if(!data.code){ - window.location.href="/"; + if (!data.code) { + window.location.href = "/"; } - else{ + else { bs_alert(data.data); } } diff --git a/static/src/js/app/oj/account/register.js b/static/src/js/app/oj/account/register.js index a7a3ea1..52c3d36 100644 --- a/static/src/js/app/oj/account/register.js +++ b/static/src/js/app/oj/account/register.js @@ -1,14 +1,10 @@ -require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrfHeader){ +require(["jquery", "bs_alert", "csrf", "validation"], function ($, bs_alert, csrfHeader) { $("#register-form") - .formValidation({ + .formValidation({ framework: "bootstrap", - icon: { - valid: 'glyphicon glyphicon-ok', - invalid: 'glyphicon glyphicon-remove', - validating: 'glyphicon glyphicon-refresh' - }, fields: { username: { + trigger: 'blur', validators: { notEmpty: { message: "请填写用户名" @@ -29,23 +25,23 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf validators: { notEmpty: { message: "请填写密码" - }, - stringLength: { - min: 6, - max: 30, - message: '密码长度必须在6到30位之间' - } + }, + stringLength: { + min: 6, + max: 30, + message: '密码长度必须在6到30位之间' + } }, - onSuccess: function(e, data) { - data.fv.revalidateField('confirm_password'); + onSuccess: function (e, data) { + data.fv.revalidateField('confirm_password'); } }, real_name: { validators: { notEmpty: { message: "请填写真实姓名" - } - }, + } + } }, confirm_password: { validators: { @@ -59,6 +55,7 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf } }, email: { + trigger: 'blur', validators: { notEmpty: { message: "请填写电子邮箱邮箱地址" @@ -75,22 +72,23 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf } } } - ).on('success.form.fv', function(e) { + ).on('success.form.fv', function (e) { e.preventDefault(); var username = $("#username").val(); var real_name = $("#real_name").val(); var password = $("#password").val(); + var email = $("#email").val(); $.ajax({ beforeSend: csrfHeader, url: "/api/register/", - data: {username: username, real_name: real_name, password: password}, + data: {username: username, real_name: real_name, password: password, email: email}, dataType: "json", method: "post", success: function (data) { - if(!data.code){ - window.location.href="/login/"; + if (!data.code) { + window.location.href = "/login/"; } - else{ + else { bs_alert(data.data); } }