Project

General

Profile

« Previous | Next » 

Revision 51695

Change username regulars expression - Allow usernames that start with character or digit, Change error messages

View differences:

register.jsp
75 75
                                            <div class="form-group">
76 76
                                                <span class="msg_username_min_lenght uk-text-danger uk-text-small uk-float-left" style="display:none">Minimum username length 5 characters.</span>
77 77
                                                <span class="msg_username_max_lenght uk-text-danger uk-text-small uk-float-left" style="display:none">Maximum username length 150 characters.</span>
78
                                                <span class="msg_username_allowed_characters uk-text-danger uk-text-small uk-float-left" style="display:none">You can use only letters, numbers, underscores, hyphens and periods.</span>
78
                                                <span class="msg_username_start uk-text-danger uk-text-small uk-float-left" style="display:none">The username must start with letter or digit.</span>
79
                                                <span class="msg_username_allowed_characters uk-text-danger uk-text-small uk-float-left" style="display:none">You can use letters, numbers, underscores, hyphens and periods.</span>
79 80
                                                <span class="msg_username_error uk-text-danger uk-text-small uk-float-left" style="display:none">Please enter your username.</span>
80 81
                                                <span id="username_server_error" class="uk-text-danger uk-text-small uk-float-left">${username_message}</span>
81
                                                <span id="username_allowed_server_error" class="uk-text-danger uk-text-small uk-float-left">${username_allowed_message}</span>
82
                                                <span id="username_allowed_chars_server_error" class="uk-text-danger uk-text-small uk-float-left">${username_allowed_chars_message}</span>
83
                                                <span id="username_first_char_server_error" class="uk-text-danger uk-text-small uk-float-left">${username_first_char_message}</span>
82 84
                                                <c:remove var="username_message" scope="session" />
85
                                                <c:remove var="username_allowed_chars_message" scope="session" />
86
                                                <c:remove var="username_first_char_message" scope="session" />
83 87
                                                <input id="username" name="username" type="text" placeholder="Username (*)" class="form-control" value=${username}></div>
84 88
                                                <c:remove var="username" scope="session" />
85 89
                                            <div class="form-group">
......
180 184
                                            } else {
181 185
                                                $(".msg_username_max_lenght").fadeIn();
182 186
                                            }
183
                                            var allowedChars = /^[a-zA-Z0-9._-]{4,150}$/;
187
                                            var allowedChars = /^[a-zA-Z0-9._-]*$/;
184 188
                                            if (usernameInput.value.match(allowedChars)) {
185 189
                                                $(".msg_username_allowed_characters").fadeOut();
186 190
                                            } else {
187 191
                                                $(".msg_username_allowed_characters").fadeIn();
188 192
                                            }
193
                                            var startsWith = /^[a-zA-Z0-9].*/;
194
                                            if (usernameInput.value.match(startsWith)) {
195
                                                $(".msg_username_start").fadeOut();
196
                                            } else {
197
                                                $(".msg_username_start").fadeIn();
198
                                            }
189 199
                                        }
190
//                                        myEmailInput.onfocusOut = function() {
191
//
192
//                                        }
193 200

  
201

  
194 202
                                        $("#first_name").focusin(function () {
195 203
                                            $(this).removeClass('aai-form-danger');
196 204
                                            $(".msg_first_name_error").fadeOut();
......
205 213
                                            $(this).removeClass('aai-form-danger');
206 214
                                            $(".msg_username_error").fadeOut();
207 215
                                            $("#username_server_error").fadeOut();
208
                                            $("#username_allowed_server_error").fadeOut();
209

  
216
                                            $("#username_allowed_chars_server_error").fadeOut();
217
                                            $("#username_first_char_server_error").fadeOut();
210 218
                                        });
211 219

  
212 220
                                        $("#email").focusin(function () {

Also available in: Unified diff