diff --git a/1-js/1-getting-started/1-intro/limitations.png b/1-js/1-getting-started/1-intro/limitations.png index 669db305..9e443f71 100644 Binary files a/1-js/1-getting-started/1-intro/limitations.png and b/1-js/1-getting-started/1-intro/limitations.png differ diff --git a/1-js/1-getting-started/1-intro/limitations@2x.png b/1-js/1-getting-started/1-intro/limitations@2x.png index aef72ce2..bc210fe2 100644 Binary files a/1-js/1-getting-started/1-intro/limitations@2x.png and b/1-js/1-getting-started/1-intro/limitations@2x.png differ diff --git a/1-js/2-first-steps/5-variables/variable-change.png b/1-js/2-first-steps/5-variables/variable-change.png index 29531507..45a3b32c 100644 Binary files a/1-js/2-first-steps/5-variables/variable-change.png and b/1-js/2-first-steps/5-variables/variable-change.png differ diff --git a/1-js/2-first-steps/5-variables/variable-change@2x.png b/1-js/2-first-steps/5-variables/variable-change@2x.png index 855fee00..00539b3a 100644 Binary files a/1-js/2-first-steps/5-variables/variable-change@2x.png and b/1-js/2-first-steps/5-variables/variable-change@2x.png differ diff --git a/1-js/2-first-steps/5-variables/variable.png b/1-js/2-first-steps/5-variables/variable.png index 820d6f8e..60cb17d3 100644 Binary files a/1-js/2-first-steps/5-variables/variable.png and b/1-js/2-first-steps/5-variables/variable.png differ diff --git a/1-js/2-first-steps/5-variables/variable@2x.png b/1-js/2-first-steps/5-variables/variable@2x.png index 68573ab8..22d562b5 100644 Binary files a/1-js/2-first-steps/5-variables/variable@2x.png and b/1-js/2-first-steps/5-variables/variable@2x.png differ diff --git a/1-js/3-writing-js/2-coding-style/code-style.png b/1-js/3-writing-js/2-coding-style/code-style.png index 769ccb75..5b2d9940 100644 Binary files a/1-js/3-writing-js/2-coding-style/code-style.png and b/1-js/3-writing-js/2-coding-style/code-style.png differ diff --git a/1-js/3-writing-js/2-coding-style/code-style@2x.png b/1-js/3-writing-js/2-coding-style/code-style@2x.png index 295711a5..72eb4308 100644 Binary files a/1-js/3-writing-js/2-coding-style/code-style@2x.png and b/1-js/3-writing-js/2-coding-style/code-style@2x.png differ diff --git a/1-js/3-writing-js/2-coding-style/figure-bracket-style.png b/1-js/3-writing-js/2-coding-style/figure-bracket-style.png index 61b1e8ca..71094591 100644 Binary files a/1-js/3-writing-js/2-coding-style/figure-bracket-style.png and b/1-js/3-writing-js/2-coding-style/figure-bracket-style.png differ diff --git a/1-js/3-writing-js/2-coding-style/figure-bracket-style@2x.png b/1-js/3-writing-js/2-coding-style/figure-bracket-style@2x.png index dad9a092..c12810b6 100644 Binary files a/1-js/3-writing-js/2-coding-style/figure-bracket-style@2x.png and b/1-js/3-writing-js/2-coding-style/figure-bracket-style@2x.png differ diff --git a/1-js/4-data-structures/3-string/article.md b/1-js/4-data-structures/3-string/article.md index 2b77aaa6..e744c985 100644 --- a/1-js/4-data-structures/3-string/article.md +++ b/1-js/4-data-structures/3-string/article.md @@ -210,7 +210,7 @@ alert( ~-1 ); // -(-1+1) = 0 Как видно, `~n` -- ноль только в случае, когда `n == -1`. -То есть, проверка `if ( ~str.indexOf(...) )` означает, что результат `indexOf` отличен от `-1, т.е. совпадение есть. +То есть, проверка `if ( ~str.indexOf(...) )` означает, что результат `indexOf` отличен от `-1`, т.е. совпадение есть. Вот так: diff --git a/1-js/4-data-structures/4-object/object-person-1@2x.png b/1-js/4-data-structures/4-object/object-person-1@2x.png index bbdcaad5..1b4afcfb 100644 Binary files a/1-js/4-data-structures/4-object/object-person-1@2x.png and b/1-js/4-data-structures/4-object/object-person-1@2x.png differ diff --git a/1-js/4-data-structures/4-object/object-person-empty.png b/1-js/4-data-structures/4-object/object-person-empty.png index 9993fba1..54e9aee7 100644 Binary files a/1-js/4-data-structures/4-object/object-person-empty.png and b/1-js/4-data-structures/4-object/object-person-empty.png differ diff --git a/1-js/4-data-structures/4-object/object-person-empty@2x.png b/1-js/4-data-structures/4-object/object-person-empty@2x.png index 58dbf6e5..1a0410e2 100644 Binary files a/1-js/4-data-structures/4-object/object-person-empty@2x.png and b/1-js/4-data-structures/4-object/object-person-empty@2x.png differ diff --git a/1-js/4-data-structures/4-object/object@2x.png b/1-js/4-data-structures/4-object/object@2x.png index 53802a63..73764fde 100644 Binary files a/1-js/4-data-structures/4-object/object@2x.png and b/1-js/4-data-structures/4-object/object@2x.png differ diff --git a/1-js/4-data-structures/6-object-reference/variable-contains-reference.png b/1-js/4-data-structures/6-object-reference/variable-contains-reference.png index b418e03c..b5e37abd 100644 Binary files a/1-js/4-data-structures/6-object-reference/variable-contains-reference.png and b/1-js/4-data-structures/6-object-reference/variable-contains-reference.png differ diff --git a/1-js/4-data-structures/6-object-reference/variable-contains-reference@2x.png b/1-js/4-data-structures/6-object-reference/variable-contains-reference@2x.png index 19f3f817..6d5b404b 100644 Binary files a/1-js/4-data-structures/6-object-reference/variable-contains-reference@2x.png and b/1-js/4-data-structures/6-object-reference/variable-contains-reference@2x.png differ diff --git a/1-js/4-data-structures/6-object-reference/variable-copy-reference.png b/1-js/4-data-structures/6-object-reference/variable-copy-reference.png index e746e068..5a33ff7e 100644 Binary files a/1-js/4-data-structures/6-object-reference/variable-copy-reference.png and b/1-js/4-data-structures/6-object-reference/variable-copy-reference.png differ diff --git a/1-js/4-data-structures/6-object-reference/variable-copy-value.png b/1-js/4-data-structures/6-object-reference/variable-copy-value.png index 14be0c52..811c9b8f 100644 Binary files a/1-js/4-data-structures/6-object-reference/variable-copy-value.png and b/1-js/4-data-structures/6-object-reference/variable-copy-value.png differ diff --git a/1-js/4-data-structures/6-object-reference/variable-copy-value@2x.png b/1-js/4-data-structures/6-object-reference/variable-copy-value@2x.png index 58abf5f4..83460a40 100644 Binary files a/1-js/4-data-structures/6-object-reference/variable-copy-value@2x.png and b/1-js/4-data-structures/6-object-reference/variable-copy-value@2x.png differ diff --git a/1-js/4-data-structures/7-array/array-pop.png b/1-js/4-data-structures/7-array/array-pop.png index 26f39698..557c85ef 100644 Binary files a/1-js/4-data-structures/7-array/array-pop.png and b/1-js/4-data-structures/7-array/array-pop.png differ diff --git a/1-js/4-data-structures/7-array/array-pop@2x.png b/1-js/4-data-structures/7-array/array-pop@2x.png index 2c0c9b13..ddceb175 100644 Binary files a/1-js/4-data-structures/7-array/array-pop@2x.png and b/1-js/4-data-structures/7-array/array-pop@2x.png differ diff --git a/1-js/4-data-structures/7-array/array-shift.png b/1-js/4-data-structures/7-array/array-shift.png index fc1cb1e1..1243e8de 100644 Binary files a/1-js/4-data-structures/7-array/array-shift.png and b/1-js/4-data-structures/7-array/array-shift.png differ diff --git a/1-js/4-data-structures/7-array/array-shift@2x.png b/1-js/4-data-structures/7-array/array-shift@2x.png index 3049f107..82eef945 100644 Binary files a/1-js/4-data-structures/7-array/array-shift@2x.png and b/1-js/4-data-structures/7-array/array-shift@2x.png differ diff --git a/1-js/4-data-structures/7-array/array-speed.png b/1-js/4-data-structures/7-array/array-speed.png index 62bdc506..827837a6 100644 Binary files a/1-js/4-data-structures/7-array/array-speed.png and b/1-js/4-data-structures/7-array/array-speed.png differ diff --git a/1-js/4-data-structures/7-array/array-speed@2x.png b/1-js/4-data-structures/7-array/array-speed@2x.png index 1de92618..43c7a1c4 100644 Binary files a/1-js/4-data-structures/7-array/array-speed@2x.png and b/1-js/4-data-structures/7-array/array-speed@2x.png differ diff --git a/1-js/4-data-structures/7-array/queue@2x.png b/1-js/4-data-structures/7-array/queue@2x.png index 81fe2225..e2db9747 100644 Binary files a/1-js/4-data-structures/7-array/queue@2x.png and b/1-js/4-data-structures/7-array/queue@2x.png differ diff --git a/1-js/4-data-structures/7-array/stack.png b/1-js/4-data-structures/7-array/stack.png index 923d9ffa..d49d4901 100644 Binary files a/1-js/4-data-structures/7-array/stack.png and b/1-js/4-data-structures/7-array/stack.png differ diff --git a/1-js/4-data-structures/7-array/stack@2x.png b/1-js/4-data-structures/7-array/stack@2x.png index e66c1a59..4242b747 100644 Binary files a/1-js/4-data-structures/7-array/stack@2x.png and b/1-js/4-data-structures/7-array/stack@2x.png differ diff --git a/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list.png b/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list.png index d1a77dac..87d31f4f 100644 Binary files a/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list.png and b/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list.png differ diff --git a/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list@2x.png b/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list@2x.png index d3fe5ff1..c3b1e140 100644 Binary files a/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list@2x.png and b/1-js/4-data-structures/8-array-methods/9-output-single-linked-list/linked-list@2x.png differ diff --git a/1-js/4-data-structures/9-array-iteration/reduce.png b/1-js/4-data-structures/9-array-iteration/reduce.png index 6278780d..45acbd2e 100644 Binary files a/1-js/4-data-structures/9-array-iteration/reduce.png and b/1-js/4-data-structures/9-array-iteration/reduce.png differ diff --git a/1-js/4-data-structures/9-array-iteration/reduce@2x.png b/1-js/4-data-structures/9-array-iteration/reduce@2x.png index 8ca6e4c3..e2f4d438 100644 Binary files a/1-js/4-data-structures/9-array-iteration/reduce@2x.png and b/1-js/4-data-structures/9-array-iteration/reduce@2x.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family-no-family.png b/1-js/5-functions-closures/6-memory-management/family-no-family.png index 1db3f5db..12588418 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family-no-family.png and b/1-js/5-functions-closures/6-memory-management/family-no-family.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family-no-family@2x.png b/1-js/5-functions-closures/6-memory-management/family-no-family@2x.png index a8b12c1e..895db8f2 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family-no-family@2x.png and b/1-js/5-functions-closures/6-memory-management/family-no-family@2x.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family-no-father-2.png b/1-js/5-functions-closures/6-memory-management/family-no-father-2.png index 54d98d6f..b625bb48 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family-no-father-2.png and b/1-js/5-functions-closures/6-memory-management/family-no-father-2.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family-no-father-2@2x.png b/1-js/5-functions-closures/6-memory-management/family-no-father-2@2x.png index acaf0c42..4cb15ee4 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family-no-father-2@2x.png and b/1-js/5-functions-closures/6-memory-management/family-no-father-2@2x.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family-no-father.png b/1-js/5-functions-closures/6-memory-management/family-no-father.png index f4df057c..cbe8b2bf 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family-no-father.png and b/1-js/5-functions-closures/6-memory-management/family-no-father.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family-no-father@2x.png b/1-js/5-functions-closures/6-memory-management/family-no-father@2x.png index c7da9ea8..a8acf84e 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family-no-father@2x.png and b/1-js/5-functions-closures/6-memory-management/family-no-father@2x.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family.png b/1-js/5-functions-closures/6-memory-management/family.png index 900985c3..69dd3922 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family.png and b/1-js/5-functions-closures/6-memory-management/family.png differ diff --git a/1-js/5-functions-closures/6-memory-management/family@2x.png b/1-js/5-functions-closures/6-memory-management/family@2x.png index 32968f34..dd0c26d5 100644 Binary files a/1-js/5-functions-closures/6-memory-management/family@2x.png and b/1-js/5-functions-closures/6-memory-management/family@2x.png differ diff --git a/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval.png b/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval.png index 69275dd3..d0eb6f8f 100644 Binary files a/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval.png and b/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval.png differ diff --git a/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval@2x.png b/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval@2x.png index 86437fe4..ba84bab7 100644 Binary files a/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval@2x.png and b/1-js/7-js-misc/3-setTimeout-setInterval/setinterval-interval@2x.png differ diff --git a/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval.png b/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval.png index 89f58fba..99cf33b0 100644 Binary files a/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval.png and b/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval.png differ diff --git a/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval@2x.png b/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval@2x.png index 5010ac0b..5e70fef6 100644 Binary files a/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval@2x.png and b/1-js/7-js-misc/3-setTimeout-setInterval/settimeout-interval@2x.png differ diff --git a/1-js/7-js-misc/5-exception/article.md b/1-js/7-js-misc/5-exception/article.md index f7cb01ed..42b30917 100644 --- a/1-js/7-js-misc/5-exception/article.md +++ b/1-js/7-js-misc/5-exception/article.md @@ -509,7 +509,7 @@ function func() { alert( func() ); // сначала finally, потом 1 ``` -В примере выше `try..finally` вообще не обрабатывает ошибки. Задача в другом -- выполнить код при любом выходе из `try` -- с ошибкой ли, без ошибок или через `return. +В примере выше `try..finally` вообще не обрабатывает ошибки. Задача в другом -- выполнить код при любом выходе из `try` -- с ошибкой ли, без ошибок или через `return`. [/smart] diff --git a/1-js/9-prototypes/1-prototype/proto-animal-rabbit.png b/1-js/9-prototypes/1-prototype/proto-animal-rabbit.png index db5910b9..1f18049e 100644 Binary files a/1-js/9-prototypes/1-prototype/proto-animal-rabbit.png and b/1-js/9-prototypes/1-prototype/proto-animal-rabbit.png differ diff --git a/1-js/9-prototypes/1-prototype/proto-animal-rabbit@2x.png b/1-js/9-prototypes/1-prototype/proto-animal-rabbit@2x.png index e0ae7092..03d89af3 100644 Binary files a/1-js/9-prototypes/1-prototype/proto-animal-rabbit@2x.png and b/1-js/9-prototypes/1-prototype/proto-animal-rabbit@2x.png differ diff --git a/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring.png b/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring.png index d15b2606..0c54b39c 100644 Binary files a/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring.png and b/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring.png differ diff --git a/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring@2x.png b/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring@2x.png index b3784e51..46150fab 100644 Binary files a/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring@2x.png and b/1-js/9-prototypes/3-native-prototypes/native-prototypes-array-tostring@2x.png differ diff --git a/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes.png b/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes.png index 86e0db65..ce43866a 100644 Binary files a/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes.png and b/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes.png differ diff --git a/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes@2x.png b/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes@2x.png index 970ef9b0..c5197e42 100644 Binary files a/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes@2x.png and b/1-js/9-prototypes/3-native-prototypes/native-prototypes-classes@2x.png differ diff --git a/1-js/9-prototypes/3-native-prototypes/native-prototypes-object.png b/1-js/9-prototypes/3-native-prototypes/native-prototypes-object.png index b58ee38d..169f0206 100644 Binary files a/1-js/9-prototypes/3-native-prototypes/native-prototypes-object.png and b/1-js/9-prototypes/3-native-prototypes/native-prototypes-object.png differ diff --git a/1-js/9-prototypes/3-native-prototypes/native-prototypes-object@2x.png b/1-js/9-prototypes/3-native-prototypes/native-prototypes-object@2x.png index c3e32db8..754d366f 100644 Binary files a/1-js/9-prototypes/3-native-prototypes/native-prototypes-object@2x.png and b/1-js/9-prototypes/3-native-prototypes/native-prototypes-object@2x.png differ diff --git a/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object.png b/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object.png index e34560af..fa983533 100644 Binary files a/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object.png and b/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object.png differ diff --git a/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object@2x.png b/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object@2x.png index bdf0d5fd..b9c2ffe5 100644 Binary files a/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object@2x.png and b/1-js/9-prototypes/5-class-inheritance/class-inheritance-array-object@2x.png differ diff --git a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal.png b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal.png index d7f00506..d15e6d0e 100644 Binary files a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal.png and b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal.png differ diff --git a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal@2x.png b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal@2x.png index 81865f56..2a4af278 100644 Binary files a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal@2x.png and b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-animal@2x.png differ diff --git a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal.png b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal.png index 2dcd1135..97320064 100644 Binary files a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal.png and b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal.png differ diff --git a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal@2x.png b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal@2x.png index 002c2afc..e9d40e80 100644 Binary files a/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal@2x.png and b/1-js/9-prototypes/5-class-inheritance/class-inheritance-rabbit-run-animal@2x.png differ diff --git a/10-regular-expressions-javascript/13-regexp-infinite-backtracking-problem/article.md b/10-regular-expressions-javascript/13-regexp-infinite-backtracking-problem/article.md index df264aa9..582c1066 100644 --- a/10-regular-expressions-javascript/13-regexp-infinite-backtracking-problem/article.md +++ b/10-regular-expressions-javascript/13-regexp-infinite-backtracking-problem/article.md @@ -207,8 +207,10 @@ alert( '12345678901234567890123456789123456789z'.match(/(\d+)*$/) ); (123456)(78)(9)z ``` - +
  • ...И так далее. +
    • + Получается, что движок регулярных выражений перебирает все комбинации из `123456789` и их подпоследовательности. А таких комбинаций очень много. diff --git a/10-regular-expressions-javascript/3-regexp-character-classes/hello-java-boundaries@2x.png b/10-regular-expressions-javascript/3-regexp-character-classes/hello-java-boundaries@2x.png index 6511babf..f63ccce1 100644 Binary files a/10-regular-expressions-javascript/3-regexp-character-classes/hello-java-boundaries@2x.png and b/10-regular-expressions-javascript/3-regexp-character-classes/hello-java-boundaries@2x.png differ diff --git a/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes.png b/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes.png index 3314da41..94914986 100644 Binary files a/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes.png and b/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes.png differ diff --git a/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes@2x.png b/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes@2x.png index dbd721bd..0efd99c4 100644 Binary files a/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes@2x.png and b/10-regular-expressions-javascript/3-regexp-character-classes/love-html5-classes@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1.png index 181b6170..e50c8a78 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1@2x.png index 71ab0bc1..784f8619 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy1@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2.png index 47f874a3..a6098797 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2@2x.png index cf2bf485..3af62e72 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy2@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3.png index dda24fd9..1e9fb351 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3@2x.png index b2ba5114..65c803a1 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy3@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4.png index dc12bd6b..ab01ea11 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4@2x.png index ea9faac0..e8c1720e 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy4@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5.png index 2c124d91..392c08c5 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5@2x.png index e3203169..c2e7957f 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy5@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6.png index ddf183af..f3468b5b 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6@2x.png index f6fc0af0..f97d6b1b 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_greedy6@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3.png index d486486b..44428a58 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3@2x.png index 8a2b16c4..c382f72e 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy3@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4.png index 18533d25..0643026e 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4@2x.png index 3d0e3e99..ac35b57c 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy4@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5.png index dea36794..55d4ff05 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5@2x.png index 8d8b242c..4d38af43 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy5@2x.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6.png index 2b3e7b80..1da403d9 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6.png differ diff --git a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6@2x.png b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6@2x.png index 99a7fe31..898603b0 100644 Binary files a/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6@2x.png and b/10-regular-expressions-javascript/6-regexp-greedy-and-lazy/witch_lazy6@2x.png differ diff --git a/10-regular-expressions-javascript/7-regexp-groups/2-parse-expression/task.md b/10-regular-expressions-javascript/7-regexp-groups/2-parse-expression/task.md index 353ae5f4..c48e5a0c 100644 --- a/10-regular-expressions-javascript/7-regexp-groups/2-parse-expression/task.md +++ b/10-regular-expressions-javascript/7-regexp-groups/2-parse-expression/task.md @@ -5,7 +5,7 @@
  • `1 + 2`
  • `1.2 * 3.4`
  • `-3 / -6`
    • -
  • -2 - 2`
    • +
  • `-2 - 2`
    • Список операций: `"+"`, `"-"`, `"*"` и `"/"`. @@ -17,4 +17,4 @@
  • Первое число.
  • Оператор.
  • Второе число.
    • - + diff --git a/10-regular-expressions-javascript/7-regexp-groups/article.md b/10-regular-expressions-javascript/7-regexp-groups/article.md index 29d8a138..515c6175 100644 --- a/10-regular-expressions-javascript/7-regexp-groups/article.md +++ b/10-regular-expressions-javascript/7-regexp-groups/article.md @@ -128,7 +128,6 @@ alert( match[2] ); // c Скобочную группу можно исключить из запоминаемых и нумеруемых, добавив в её начало ?:. - Например, мы хотим найти (go)+, но содержимое скобок (`go`) в отдельный элемент массива выделять не хотим. Для этого нужно сразу после открывающей скобки поставить `?:`, то есть: (?:go)+. diff --git a/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups.png b/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups.png index 1fd0cbec..1c92585a 100644 Binary files a/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups.png and b/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups.png differ diff --git a/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups@2x.png b/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups@2x.png index b7f74ca1..840bb2c4 100644 Binary files a/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups@2x.png and b/10-regular-expressions-javascript/7-regexp-groups/regexp-nested-groups@2x.png differ diff --git a/10-regular-expressions-javascript/8-regexp-backreferences/article.md b/10-regular-expressions-javascript/8-regexp-backreferences/article.md index 46c9e21b..3814da12 100644 --- a/10-regular-expressions-javascript/8-regexp-backreferences/article.md +++ b/10-regular-expressions-javascript/8-regexp-backreferences/article.md @@ -2,7 +2,8 @@ Скобочные группы можно не только получать в результате. -На скобочные группы можно ссылаться как в самом паттерне, так и в строке замены. +Движок регулярных выражений запоминает их содержимое, и затем его можно использовать как в самом паттерне, так и в строке замены. + [cut] ## Группа в строке замены diff --git a/11-extra/11-intl/article.md b/11-extra/11-intl/article.md index cadb81e9..97619b99 100644 --- a/11-extra/11-intl/article.md +++ b/11-extra/11-intl/article.md @@ -445,7 +445,7 @@ alert( formatter.format(1234.5) ); // 1 234,50 £ Методы форматирования также поддерживаются в обычных строках, датах, числах:
    -
    `String.prototype.localeCompare`(that [, locales [, options]])`
    +
    `String.prototype.localeCompare(that [, locales [, options]])`
    Сравнивает строку с другой, с учётом локали, например: ```js @@ -469,7 +469,7 @@ alert( date.toLocaleString("ru", { year: 'numeric', month: 'long' }) ); // Де
    `Date.prototype.toLocaleDateString([locales [, options]])`
    То же, что и выше, но опции по умолчанию включают в себя год, месяц, день
    -
    `Date.prototype.toLocaleTimeString`([locales [, options]])`
    +
    `Date.prototype.toLocaleTimeString([locales [, options]])`
    То же, что и выше, но опции по умолчанию включают в себя часы, минуты, секунды
    `Number.prototype.toLocaleString([locales [, options]])`
    Форматирует число, используя опции `Intl.NumberFormat`.
    diff --git a/11-extra/8-range-textrange-selection/article.md b/11-extra/8-range-textrange-selection/article.md index db67a2c7..1f53f9b1 100644 --- a/11-extra/8-range-textrange-selection/article.md +++ b/11-extra/8-range-textrange-selection/article.md @@ -41,7 +41,7 @@ HTML: ```html
    -

    Соз|даем объект `Range`

    +

    Соз|даем объект Range

    От третье|го символа заголовка до десятого символа это абзаца.

    diff --git a/2-ui/1-document/1-browser-environment/windowObjects.png b/2-ui/1-document/1-browser-environment/windowObjects.png index 0f2c5c23..91d2ef32 100644 Binary files a/2-ui/1-document/1-browser-environment/windowObjects.png and b/2-ui/1-document/1-browser-environment/windowObjects.png differ diff --git a/2-ui/1-document/1-browser-environment/windowObjects@2x.png b/2-ui/1-document/1-browser-environment/windowObjects@2x.png index fa8d380e..574ef4bb 100644 Binary files a/2-ui/1-document/1-browser-environment/windowObjects@2x.png and b/2-ui/1-document/1-browser-environment/windowObjects@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-all.png b/2-ui/1-document/15-metrics/metric-all.png index 5e42ef4e..1123ff42 100644 Binary files a/2-ui/1-document/15-metrics/metric-all.png and b/2-ui/1-document/15-metrics/metric-all.png differ diff --git a/2-ui/1-document/15-metrics/metric-all@2x.png b/2-ui/1-document/15-metrics/metric-all@2x.png index 00572380..05cf6882 100644 Binary files a/2-ui/1-document/15-metrics/metric-all@2x.png and b/2-ui/1-document/15-metrics/metric-all@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-client-left-top-rtl.png b/2-ui/1-document/15-metrics/metric-client-left-top-rtl.png index 3655cb3b..96b13d93 100644 Binary files a/2-ui/1-document/15-metrics/metric-client-left-top-rtl.png and b/2-ui/1-document/15-metrics/metric-client-left-top-rtl.png differ diff --git a/2-ui/1-document/15-metrics/metric-client-left-top-rtl@2x.png b/2-ui/1-document/15-metrics/metric-client-left-top-rtl@2x.png index 24f50c17..7c722924 100644 Binary files a/2-ui/1-document/15-metrics/metric-client-left-top-rtl@2x.png and b/2-ui/1-document/15-metrics/metric-client-left-top-rtl@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-client-left-top.png b/2-ui/1-document/15-metrics/metric-client-left-top.png index 273e494c..5d4bd5c2 100644 Binary files a/2-ui/1-document/15-metrics/metric-client-left-top.png and b/2-ui/1-document/15-metrics/metric-client-left-top.png differ diff --git a/2-ui/1-document/15-metrics/metric-client-left-top@2x.png b/2-ui/1-document/15-metrics/metric-client-left-top@2x.png index 8b2e46e7..e5c06503 100644 Binary files a/2-ui/1-document/15-metrics/metric-client-left-top@2x.png and b/2-ui/1-document/15-metrics/metric-client-left-top@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-client-width-height.png b/2-ui/1-document/15-metrics/metric-client-width-height.png index ccc9f18a..9c12fedb 100644 Binary files a/2-ui/1-document/15-metrics/metric-client-width-height.png and b/2-ui/1-document/15-metrics/metric-client-width-height.png differ diff --git a/2-ui/1-document/15-metrics/metric-client-width-nopadding.png b/2-ui/1-document/15-metrics/metric-client-width-nopadding.png index 6b72e987..464d769c 100644 Binary files a/2-ui/1-document/15-metrics/metric-client-width-nopadding.png and b/2-ui/1-document/15-metrics/metric-client-width-nopadding.png differ diff --git a/2-ui/1-document/15-metrics/metric-client-width-nopadding@2x.png b/2-ui/1-document/15-metrics/metric-client-width-nopadding@2x.png index 9143e26d..bd266425 100644 Binary files a/2-ui/1-document/15-metrics/metric-client-width-nopadding@2x.png and b/2-ui/1-document/15-metrics/metric-client-width-nopadding@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-css.png b/2-ui/1-document/15-metrics/metric-css.png index ff3d3cc1..c6346008 100644 Binary files a/2-ui/1-document/15-metrics/metric-css.png and b/2-ui/1-document/15-metrics/metric-css.png differ diff --git a/2-ui/1-document/15-metrics/metric-css@2x.png b/2-ui/1-document/15-metrics/metric-css@2x.png index dde33d00..1b666b05 100644 Binary files a/2-ui/1-document/15-metrics/metric-css@2x.png and b/2-ui/1-document/15-metrics/metric-css@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-offset-parent.png b/2-ui/1-document/15-metrics/metric-offset-parent.png index f969f1d8..a4e29c93 100644 Binary files a/2-ui/1-document/15-metrics/metric-offset-parent.png and b/2-ui/1-document/15-metrics/metric-offset-parent.png differ diff --git a/2-ui/1-document/15-metrics/metric-offset-parent@2x.png b/2-ui/1-document/15-metrics/metric-offset-parent@2x.png index 21cafc47..e5600792 100644 Binary files a/2-ui/1-document/15-metrics/metric-offset-parent@2x.png and b/2-ui/1-document/15-metrics/metric-offset-parent@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-scroll-top.png b/2-ui/1-document/15-metrics/metric-scroll-top.png index ebbaec00..6dbaced9 100644 Binary files a/2-ui/1-document/15-metrics/metric-scroll-top.png and b/2-ui/1-document/15-metrics/metric-scroll-top.png differ diff --git a/2-ui/1-document/15-metrics/metric-scroll-top@2x.png b/2-ui/1-document/15-metrics/metric-scroll-top@2x.png index 35c23c6f..3d13f6f9 100644 Binary files a/2-ui/1-document/15-metrics/metric-scroll-top@2x.png and b/2-ui/1-document/15-metrics/metric-scroll-top@2x.png differ diff --git a/2-ui/1-document/15-metrics/metric-scroll-width-height.png b/2-ui/1-document/15-metrics/metric-scroll-width-height.png index c00dfe61..ff1629d7 100644 Binary files a/2-ui/1-document/15-metrics/metric-scroll-width-height.png and b/2-ui/1-document/15-metrics/metric-scroll-width-height.png differ diff --git a/2-ui/1-document/15-metrics/metric-scroll-width-height@2x.png b/2-ui/1-document/15-metrics/metric-scroll-width-height@2x.png index 488391e0..4f724e9b 100644 Binary files a/2-ui/1-document/15-metrics/metric-scroll-width-height@2x.png and b/2-ui/1-document/15-metrics/metric-scroll-width-height@2x.png differ diff --git a/2-ui/1-document/16-metrics-window/document-client-width-height.png b/2-ui/1-document/16-metrics-window/document-client-width-height.png index 0e9387a2..66c7200a 100644 Binary files a/2-ui/1-document/16-metrics-window/document-client-width-height.png and b/2-ui/1-document/16-metrics-window/document-client-width-height.png differ diff --git a/2-ui/1-document/16-metrics-window/document-client-width-height@2x.png b/2-ui/1-document/16-metrics-window/document-client-width-height@2x.png index 4dc1d15f..f9c7d72c 100644 Binary files a/2-ui/1-document/16-metrics-window/document-client-width-height@2x.png and b/2-ui/1-document/16-metrics-window/document-client-width-height@2x.png differ diff --git a/2-ui/1-document/17-coordinates/coords.png b/2-ui/1-document/17-coordinates/coords.png index 26838c15..449ff658 100644 Binary files a/2-ui/1-document/17-coordinates/coords.png and b/2-ui/1-document/17-coordinates/coords.png differ diff --git a/2-ui/1-document/17-coordinates/coords@2x.png b/2-ui/1-document/17-coordinates/coords@2x.png index 768c0dff..7636420a 100644 Binary files a/2-ui/1-document/17-coordinates/coords@2x.png and b/2-ui/1-document/17-coordinates/coords@2x.png differ diff --git a/2-ui/1-document/19-dom-cheatsheet/article.md b/2-ui/1-document/19-dom-cheatsheet/article.md index 51820faf..4e5fbf9b 100644 --- a/2-ui/1-document/19-dom-cheatsheet/article.md +++ b/2-ui/1-document/19-dom-cheatsheet/article.md @@ -166,7 +166,7 @@