Lesson 6 #75
Open
Lesson 6 #75
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added homework for lesson 1
домашка lesson-1
домашка lesson-3
домашка lesson-3
домашка lesson-4
домашка lesson-6
MarySampir
reviewed
May 16, 2018
| } | ||
|
|
||
| getCachedValue = (cachedValue, str) => { | ||
| for(let key in cachedValue) { |
MarySampir
reviewed
May 16, 2018
|
|
||
| function EmailValidator(str) { | ||
| BaseValidator.call(this); | ||
|
|
There was a problem hiding this comment.
убери лишние пустые строки до и после объявления переменной
MarySampir
reviewed
May 16, 2018
| let result = getCachedValue(cachedValue, str); | ||
| if(result === undefined) { //Валидировать дату через регулярное выражение, наверно, не самое правильное решение. Сильно длинно и нечитаемо... Но вариант через кучу if, пожалуй, не лучше... но если надо перепишу | ||
| cachedValue[`${str}`] = /^(?=\d)(?:(?:31(?!.(?:0?[2469]|11))|(?:30|29)(?!.0?2)|29(?=.0?2.(?:(?:(?:1[6-9]|[2-9]\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))(?:\x20|$))|(?:2[0-8]|1\d|0?[1-9]))([-.\/])(?:1[012]|0?[1-9])\1(?:1[6-9]|[2-9]\d)?\d\d(?:(?=\x20\d)\x20|$))?(((0?[1-9]|1[012])(:[0-5]\d){0,2}(\x20[AP]M))|([01]\d|2[0-3])(:[0-5]\d){1,2})?$/.test(str); | ||
| return /^(?=\d)(?:(?:31(?!.(?:0?[2469]|11))|(?:30|29)(?!.0?2)|29(?=.0?2.(?:(?:(?:1[6-9]|[2-9]\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))(?:\x20|$))|(?:2[0-8]|1\d|0?[1-9]))([-.\/])(?:1[012]|0?[1-9])\1(?:1[6-9]|[2-9]\d)?\d\d(?:(?=\x20\d)\x20|$))?(((0?[1-9]|1[012])(:[0-5]\d){0,2}(\x20[AP]M))|([01]\d|2[0-3])(:[0-5]\d){1,2})?$/.test(str) || false |
There was a problem hiding this comment.
вынеси регулярку в константу и юзай ее
MarySampir
reviewed
May 16, 2018
| let result = getCachedValue(cachedValue, str); | ||
| if(result === undefined) { | ||
| cachedValue[`${str}`] = /\([0-9]{3}\)\s[0-9]{3}-[0-9]{2}-[0-9]{2}/.test(str); | ||
| return /\([0-9]{3}\)\s[0-9]{3}-[0-9]{2}-[0-9]{2}/.test(str) || false |
There was a problem hiding this comment.
тут также
можно все регекспы вынести в верх файла и юзать их по ходу дела
MarySampir
reviewed
May 16, 2018
|
|
||
| this.ucWords = (str) => { | ||
| let myArray = str.split(' '); | ||
| const n = myArray.length; |
MarySampir
reviewed
May 16, 2018
| const n = myArray.length; | ||
|
|
||
| for(let i = 0; i < n; i++) { | ||
| myArray[i] = this.ucFirst(myArray[i]); |
MarySampir
reviewed
May 16, 2018
| return /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/.test(str) || false | ||
| } | ||
|
|
||
| this.isDate = (str) => { //Валидировать дату через регулярное выражение, наверно, не самое правильное решение. Сильно длинно и нечитаемо... Но вариант через кучу if, пожалуй, не лучше... но если надо перепишу |
There was a problem hiding this comment.
комент пиши до функции
регулярку сделай так же, как в файле выше
MarySampir
reviewed
May 16, 2018
| @@ -0,0 +1,18 @@ | |||
| function Worker(name1, surname1, rate1, days1) { | |||
| this.name = name1; | |||
There was a problem hiding this comment.
name1 и тд переименуй
name1 => why not?
MarySampir
reviewed
May 16, 2018
|
|
||
| this.setRate = (rate2) => { | ||
| rate = rate2; | ||
| } |
MarySampir
reviewed
May 16, 2018
|
|
||
| ucWords(str) { | ||
| let myArray = str.split(' '); | ||
| const n = myArray.length; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.