Ver a proveniência

[minor] [fix] trim username/fullname in login page

version-14
Anand Doshi há 12 anos
ascendente
cometimento
e3d32fff5e
2 ficheiros alterados com 9 adições e 9 eliminações
  1. +2
    -2
      public/js/wn/app.js
  2. +7
    -7
      templates/js/login.js

+ 2
- 2
public/js/wn/app.js Ver ficheiro

@@ -189,8 +189,8 @@ wn.Application = Class.extend({
}, },
set_favicon: function() { set_favicon: function() {
var link = $('link[type="image/x-icon"]').remove().attr("href"); var link = $('link[type="image/x-icon"]').remove().attr("href");
$('<link rel="shortcut icon" href="' + link + '" type="image/x-icon">').appendTo("head")
$('<link rel="icon" href="' + link + '" type="image/x-icon">').appendTo("head")
$('<link rel="shortcut icon" href="' + link + '" type="image/x-icon">').appendTo("head");
$('<link rel="icon" href="' + link + '" type="image/x-icon">').appendTo("head");
}, },
setup_keyboard_shortcuts: function() { setup_keyboard_shortcuts: function() {


+ 7
- 7
templates/js/login.js Ver ficheiro

@@ -19,11 +19,11 @@ $(document).ready(function(wrapper) {


// Login // Login
login.do_login = function(){ login.do_login = function(){
var args = {};
var args = {};
if(window.is_sign_up) { if(window.is_sign_up) {
args.cmd = "core.doctype.profile.profile.sign_up"; args.cmd = "core.doctype.profile.profile.sign_up";
args.email = $("#login_id").val();
args.full_name = $("#full_name").val();
args.email = ($("#login_id").val() || "").trim();
args.full_name = ($("#full_name").val() || "").trim();


if(!args.email || !valid_email(args.email) || !args.full_name) { if(!args.email || !valid_email(args.email) || !args.full_name) {
login.set_message("Valid email and name required."); login.set_message("Valid email and name required.");
@@ -31,7 +31,7 @@ login.do_login = function(){
} }
} else if(window.is_forgot) { } else if(window.is_forgot) {
args.cmd = "reset_password"; args.cmd = "reset_password";
args.user = $("#login_id").val();
args.user = ($("#login_id").val() || "").trim();
if(!args.user) { if(!args.user) {
login.set_message("Valid Login Id required."); login.set_message("Valid Login Id required.");
@@ -40,8 +40,8 @@ login.do_login = function(){


} else { } else {
args.cmd = "login" args.cmd = "login"
args.usr = $("#login_id").val();
args.pwd = $("#password").val();
args.usr = ($("#login_id").val() || "").trim();
args.pwd = $("#password").val();


if(!args.usr || !args.pwd) { if(!args.usr || !args.pwd) {
login.set_message("Both login and password required."); login.set_message("Both login and password required.");
@@ -118,5 +118,5 @@ login.show_forgot_password = function() {
} }


login.set_message = function(message, color) { login.set_message = function(message, color) {
$('#login_message').html(message).toggle(true);
$('#login_message').html(message).toggle(true);
} }

Carregando…
Cancelar
Guardar