From d1a0659aba551a0e29f00e4cfd30d8ea76d477dc Mon Sep 17 00:00:00 2001 From: Ilya Kantor Date: Wed, 22 Mar 2017 11:50:05 +0300 Subject: [PATCH] up --- .../01-regexp-introduction/article.md | 4 ++-- .../05-regexp-character-sets-and-ranges/article.md | 8 ++++---- .../08-regexp-greedy-and-lazy/article.md | 2 +- .../02-find-matching-bbtags/task.md | 2 +- 5-animation/1-bezier-curve/article.md | 2 +- 5-animation/2-css-animations/boat.view/index.html | 4 ++-- 5-animation/2-css-animations/boat.view/style.css | 6 ++---- 5-animation/3-js-animation/article.md | 1 - 5-animation/3-js-animation/move.view/index.html | 5 ++--- 5-animation/3-js-animation/width.view/animate.js | 12 +++++------- 5-animation/index.md | 4 ++-- .../06-clickjacking/top-location.view/iframe.html | 6 +++--- contributors.md | 4 ++-- 13 files changed, 27 insertions(+), 33 deletions(-) diff --git a/10-regular-expressions/01-regexp-introduction/article.md b/10-regular-expressions/01-regexp-introduction/article.md index 3ae39fdb..7cdb55e0 100644 --- a/10-regular-expressions/01-regexp-introduction/article.md +++ b/10-regular-expressions/01-regexp-introduction/article.md @@ -23,7 +23,7 @@ regexp = new RegExp("pattern", "flags"); ...And the short one, using slashes `"/"`: ```js -regexp = /pattern/; // no flags флагов +regexp = /pattern/; // no flags regexp = /pattern/gmi; // with flags g,m and i (to be covered soon) ``` @@ -90,7 +90,7 @@ Regular expressions may have flags that affect the search. There are only 5 of them in JavaScript: `i` -: With this flag the search is case-insensitive: no difference between `А` and `а` (see the example below). +: With this flag the search is case-insensitive: no difference between `A` and `a` (see the example below). `g` : With this flag the search looks for all matches, without it -- only the first one (we'll see uses in the next chapter). diff --git a/10-regular-expressions/05-regexp-character-sets-and-ranges/article.md b/10-regular-expressions/05-regexp-character-sets-and-ranges/article.md index f01fec1e..63803c83 100644 --- a/10-regular-expressions/05-regexp-character-sets-and-ranges/article.md +++ b/10-regular-expressions/05-regexp-character-sets-and-ranges/article.md @@ -6,7 +6,7 @@ Several characters or character classes inside square brackets `[…]` mean to " ## Sets -For instance, `pattern:[еао]` means any of the 3 characters: `'а'`, `'е'`, or `'о'`. +For instance, `pattern:[eao]` means any of the 3 characters: `'a'`, `'e'`, or `'o'`. That's calles a *set*. Sets can be used in a regexp along with regular characters: @@ -26,8 +26,8 @@ alert( "Voila".match(/V[oi]la/) ); // null, no matches The pattern assumes: -- `pattern:В`, -- then *одну* of the letters `pattern:[oi]`, +- `pattern:V`, +- then *one* of the letters `pattern:[oi]`, - then `pattern:la`. So there would be a match for `match:Vola` or `match:Vila`. @@ -70,7 +70,7 @@ They are denoted by a caret character `^` at the start and match any character * For instance: -- `pattern:[^аеуо]` -- any character except `'a'`, `'e'`, `'y'` or `'o'`. +- `pattern:[^aeyo]` -- any character except `'a'`, `'e'`, `'y'` or `'o'`. - `pattern:[^0-9]` -- any character except a digit, the same as `\D`. - `pattern:[^\s]` -- any non-space character, same as `\S`. diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/article.md b/10-regular-expressions/08-regexp-greedy-and-lazy/article.md index 25367524..f3ad4027 100644 --- a/10-regular-expressions/08-regexp-greedy-and-lazy/article.md +++ b/10-regular-expressions/08-regexp-greedy-and-lazy/article.md @@ -237,7 +237,7 @@ Let's modify the pattern by making the quantifier `pattern:.*?` lazy: let str = '...... ...'; let reg = //g; -// Сработало! +// Works! alert( str.match(reg) ); // , ``` diff --git a/10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md b/10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md index 964b3c40..e0919e03 100644 --- a/10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md +++ b/10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md @@ -4,7 +4,7 @@ A "bb-tag" looks like `[tag]...[/tag]`, where `tag` is one of: `b`, `url` or `qu For instance: ``` -[b]текст[/b] +[b]text[/b] [url]http://google.com[/url] ``` diff --git a/5-animation/1-bezier-curve/article.md b/5-animation/1-bezier-curve/article.md index dc37e9b8..2f234b1f 100644 --- a/5-animation/1-bezier-curve/article.md +++ b/5-animation/1-bezier-curve/article.md @@ -41,7 +41,7 @@ Try to move points using a mouse in the example below: [iframe src="demo.svg?nocpath=1&p=0,0,0.5,0,0.5,1,1,1" height=370] -**As you can notice, the curve stretches along the tangential lines 1 -> 2 и 3 -> 4.** +**As you can notice, the curve stretches along the tangential lines 1 -> 2 and 3 -> 4.** After some practice it becomes obvious how to place points to get the needed curve. And by connecting several curves we can get practically anything. diff --git a/5-animation/2-css-animations/boat.view/index.html b/5-animation/2-css-animations/boat.view/index.html index 29943365..60b70426 100644 --- a/5-animation/2-css-animations/boat.view/index.html +++ b/5-animation/2-css-animations/boat.view/index.html @@ -13,7 +13,7 @@ - \ No newline at end of file + diff --git a/contributors.md b/contributors.md index ee3c4661..c6b26c99 100644 --- a/contributors.md +++ b/contributors.md @@ -6,8 +6,8 @@ The file lists people who made significant contributions to the project:
  • Alexey Shisterov (tutorial)
  • Anton Vernogor @smmurf (markup)
  • Artem Beztsenny @bezart (design)
    • -
  • Илья Кантор @iliakan (tutorial, code)
    • -
  • Юрий Ткаченко @tyv (markup)
    • +
  • Ilya Kantor @iliakan (tutorial, code)
    • +
  • Yuri Tkachenko @tyv (markup)
    • The project exists for a long time, I might have missed someone. If you expect to find yourself in the list, but you're not -- please mail me at mk@javascript.ru.