Merge pull request #523 from rasika/release-2.0.x

IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
revert-70aa11f8
Rasika Perera 8 years ago committed by GitHub
commit f123f3e61e

@ -35,9 +35,9 @@
"usernameJSRegEx" : "^[\\S]{3,30}$", "usernameJSRegEx" : "^[\\S]{3,30}$",
"usernameRegExViolationErrorMsg" : "Provided username is invalid.", "usernameRegExViolationErrorMsg" : "Provided username is invalid.",
"usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.", "usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.",
"firstnameJSRegEx" : "^[\\S]{3,30}$", "firstnameJSRegEx" : "^.{3,30}$",
"firstnameRegExViolationErrorMsg" : "Provided first name is invalid.", "firstnameRegExViolationErrorMsg" : "Provided first name is invalid.",
"lastnameJSRegEx" : "^[\\S]{3,30}$", "lastnameJSRegEx" : "^.{3,30}$",
"lastnameRegExViolationErrorMsg" : "Provided last name is invalid.", "lastnameRegExViolationErrorMsg" : "Provided last name is invalid.",
"emailJSRegEx" : "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/", "emailJSRegEx" : "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/",
"emailRegExViolationErrorMsg" : "Provided email is invalid." "emailRegExViolationErrorMsg" : "Provided email is invalid."

@ -25,14 +25,14 @@
<div class="form-group"> <div class="form-group">
<label for="first_name" class="wr-input-label">First Name</label> <label for="first_name" class="wr-input-label">First Name</label>
<input type="text" id="first_name" name="first_name" class="form-control" placeholder="First Name" <input type="text" id="first_name" name="first_name" class="form-control" placeholder="First Name"
data-regex="{{usernameJSRegEx}}" data-lengthmsg="{{usernameHelpText}}" data-regex="{{firstnameJSRegEx}}" data-lengthmsg="{{usernameHelpText}}"
data-errormsg="{{usernameRegExViolationErrorMsg}}"/> data-errormsg="{{firstnameRegExViolationErrorMsg}}"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="last_name" class="wr-input-label">Last Name</label> <label for="last_name" class="wr-input-label">Last Name</label>
<input type="text" id="last_name" name="last_name" class="form-control" placeholder="Last Name" <input type="text" id="last_name" name="last_name" class="form-control" placeholder="Last Name"
data-regex="{{usernameJSRegEx}}" data-errormsg="{{usernameRegExViolationErrorMsg}}"/> data-regex="{{lastnameJSRegEx}}" data-errormsg="{{lastnameRegExViolationErrorMsg}}"/>
</div> </div>
<div class="form-group"> <div class="form-group">

Loading…
Cancel
Save