scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-14 15:09:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #827 from mewtaylor/issue/gh-816

Browse source 
[Develop] Hotfix: Remove `phoneLength` validation
This commit is contained in:
Matthew Taylor 2016-08-10 09:51:35 -04:00 committed by GitHub
commit d639d17d85
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/forms/phone-input.jsx
View file

@ -25,8 +25,7 @@ var PhoneInput = React.createClass({
getDefaultProps: function () {
return {
validations: {
isPhone: true,
phoneLength: true
isPhone: true
},
flagsImagePath: '/images/flags.png',
defaultCountry: 'us'
@ -65,8 +64,7 @@ var PhoneInput = React.createClass({
});
var phoneValidationHOC = validationHOCFactory({
isPhone: <intl.FormattedMessage id="teacherRegistration.validationPhoneNumber" />,
phoneLength: <intl.FormattedMessage id="teacherRegistration.validationPhoneNumber" />
isPhone: <intl.FormattedMessage id="teacherRegistration.validationPhoneNumber" />
});
module.exports = inputHOC(defaultValidationHOC(phoneValidationHOC(PhoneInput)));

8
src/components/forms/validations.jsx
View file

@ -21,14 +21,6 @@ module.exports.validations = {
return false;
}
return phoneNumberUtil.isValidNumber(parsed);
},
phoneLength: function (values, value) {
if (typeof value === 'undefined') return true;
if (value && value.national_number === '+') return true;
if (value && value.national_number.length === value.country_code.format.length) {
return true;
}
return false;
}
};

2
src/components/registration/steps.jsx
View file

@ -416,7 +416,7 @@ module.exports = {
};
},
onValidSubmit: function (formData, reset, invalidate) {
if (formData.phone.national_number.length !== formData.phone.country_code.format.length) {
if (!formData.phone || formData.phone.national_number === '+') {
return invalidate({
'phone': this.props.intl.formatMessage({id: 'teacherRegistration.validationPhoneNumber'})
});