Skip to content

Commit a2cab02

Browse files
committed
Merge branch 'master' of github.com:javascript-tutorial/en.javascript.info into sync-e92bb83e
2 parents 7d25af3 + e92bb83 commit a2cab02

File tree

6 files changed

+8
-8
lines changed
  • 1-js
  • 2-ui
    • 3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave
    • 99-ui-misc/03-event-loop
  • 9-regular-expressions/03-regexp-unicode

6 files changed

+8
-8
lines changed

1-js/03-code-quality/05-testing-mocha/article.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ We can select one of two ways to organize the test here:
159159
assert.equal(pow(2, 3), 8);
160160
});
161161
162-
it("3 raised to power 3 is 27", function() {
163-
assert.equal(pow(3, 3), 27);
162+
it("3 raised to power 4 is 81", function() {
163+
assert.equal(pow(3, 4), 81);
164164
});
165165
166166
});
@@ -182,7 +182,7 @@ The result:
182182

183183
[iframe height=250 src="pow-2" edit border="1"]
184184

185-
As we could expect, the second test failed. Sure, our function always returns `8`, while the `assert` expects `27`.
185+
As we could expect, the second test failed. Sure, our function always returns `8`, while the `assert` expects `81`.
186186

187187
## Improving the implementation
188188

1-js/09-classes/02-class-inheritance/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ In the example below a non-method syntax is used for comparison. `[[HomeObject]]
499499

500500
```js run
501501
let animal = {
502-
eat: function() { // intentially writing like this instead of eat() {...
502+
eat: function() { // intentionally writing like this instead of eat() {...
503503
// ...
504504
}
505505
};

1-js/09-classes/04-private-protected-properties-methods/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ With private fields that's impossible: `this['#name']` doesn't work. That's a sy
279279

280280
## Summary
281281

282-
In terms of OOP, delimiting of the internal interface from the external one is called [encapsulation]("https://en.wikipedia.org/wiki/Encapsulation_(computer_programming)").
282+
In terms of OOP, delimiting of the internal interface from the external one is called [encapsulation](https://en.wikipedia.org/wiki/Encapsulation_(computer_programming)).
283283

284284
It gives the following benefits:
285285

2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ If there are some actions upon leaving the parent element, e.g. an animation run
125125

126126
To avoid it, we can check `relatedTarget` in the handler and, if the mouse is still inside the element, then ignore such event.
127127

128-
Alternatively we can use other events: `mouseenter` и `mouseleave`, that we'll be covering now, as they don't have such problems.
128+
Alternatively we can use other events: `mouseenter` and `mouseleave`, that we'll be covering now, as they don't have such problems.
129129

130130
## Events mouseenter and mouseleave
131131

2-ui/99-ui-misc/03-event-loop/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,5 +335,5 @@ That's a way to run code in another, parallel thread.
335335
336336
Web Workers can exchange messages with the main process, but they have their own variables, and their own event loop.
337337
338-
Web Workers do not have access to DOM, so they are useful, mainly, for calculations, to use multiplle CPU cores simultaneously.
338+
Web Workers do not have access to DOM, so they are useful, mainly, for calculations, to use multiple CPU cores simultaneously.
339339
```

9-regular-expressions/03-regexp-unicode/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Unlike strings, regular expressions have flag `pattern:u` that fixes such proble
3434
## Unicode properties \p{...}
3535

3636
```warn header="Not supported in Firefox and Edge"
37-
Despite being a part of the standard since 2018, unicode proeprties are not supported in Firefox ([bug](https://bugzilla.mozilla.org/show_bug.cgi?id=1361876)) and Edge ([bug](https://github.com/Microsoft/ChakraCore/issues/2969)).
37+
Despite being a part of the standard since 2018, unicode properties are not supported in Firefox ([bug](https://bugzilla.mozilla.org/show_bug.cgi?id=1361876)) and Edge ([bug](https://github.com/Microsoft/ChakraCore/issues/2969)).
3838
3939
There's [XRegExp](http://xregexp.com) library that provides "extended" regular expressions with cross-browser support for unicode properties.
4040
```

0 commit comments

Comments
 (0)