Skip to content

Commit 77337f2

Browse files
authored
Merge pull request #2 from javascript-tutorial/sync-540d753e
Sync with upstream @ 540d753
2 parents 5e689e6 + 7ed141c commit 77337f2

10 files changed

Lines changed: 8 additions & 4 deletions

File tree

1-js/01-getting-started/4-devtools/article.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
ئاچقۇچىلار قوراللىرى سۈكۈتتىكى ھالەتتە كونسول بېتىدە ئېچىلىدۇ.
2020
نەتىجىدە ئۈستىدىكى مەزمۇن قارىماققا مۇنداق كۆرۈنىدۇ:
2121

22-
![chrome](chrome.png)
22+
![chrome](chrome.webp)
2323

2424
ئاچقۇچىلار قوراللىرىنىڭ كونكرېت قىياپىتى سىزنىڭ Chrome تور كۆرگۈچىڭىزنىڭ نۇسخىسىغا باغلىق. ئۇ پات-پات ئۆزگىرىدۇ، ئەمما ئاساسىي شەكلى ئوخشاش بولىدۇ.
2525
- ؜بۇ يەردە قىزىل رەڭلىك خاتالىق ئۇچۇرىنى كۆرىۋالالايمىز. بۇنداق ئەھۋالدا Script دا نامەلۇم «lalala» دىگەن بۇيرۇق بار.
@@ -42,10 +42,14 @@
4242

4343
ئۇلارنىڭ چىرايى ۋە بىزگە بىردىغان تەسىراتى خېلىلا ئوخشىشىپ كېتىدۇ. بۇ قوراللاردىن بىرىنى قانداق ئىشلىتىشنى بىلسىڭىز (Chrome دىن باشلىسىڭىز بولىدۇ)، باشقىلىرىنىڭ ئاچقۇچىلار قوراللىرىغا ئاسانلا ئالماشتۇرۇپ ئىشلىتىپ كىتەلەيسىز.
4444

45+
<<<<<<< HEAD
4546
## سافارى تور كۆرگۈچ (Safari)
4647

4748
؜Safari (Windows/Linux لار قوللىمايدىغان Mac تور كۆرگۈچى) بۇ يەردە سەل ئالاھىدە. بىز ئاۋۋال «ئاچقۇچى تىزىملىكى» (Developer menu) نى قوزغىتىشىمىز كېرەك.
4849
تەڭشەكنى ئاچىمىز ۋە «ئىلغار» (Advanced) نى چىكىمىز. ئاستى تەرەپتە بىر توغرا بەلگىسى قويىدىغان تاللاش تەڭشىكى بار:
50+
=======
51+
Open Settings and go to the "Advanced" pane. There's a checkbox at the bottom:
52+
>>>>>>> 540d753e90789205fc6e75c502f68382c87dea9b
4953
5054
![safari](safari.png)
5155

-41.1 KB
Binary file not shown.
22.2 KB
Loading
48.3 KB
Loading
-67.8 KB
Binary file not shown.
83 KB
Loading
55 KB
Loading

1-js/06-advanced-functions/06-function-object/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ welcome(); // Hello, Guest (nested call works)
326326

327327
Now it works, because the name `"func"` is function-local. It is not taken from outside (and not visible there). The specification guarantees that it will always reference the current function.
328328

329-
The outer code still has its variable `sayHi` or `welcome`. And `func` is an "internal function name", the way for the function to can call itself reliably.
329+
The outer code still has its variable `sayHi` or `welcome`. And `func` is an "internal function name", the way for the function to call itself reliably.
330330

331331
```smart header="There's no such thing for Function Declaration"
332332
The "internal name" feature described here is only available for Function Expressions, not for Function Declarations. For Function Declarations, there is no syntax for adding an "internal" name.

1-js/06-advanced-functions/10-bind/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ funcUser(); // John
125125
*/!*
126126
```
127127

128-
Here `func.bind(user)` as a "bound variant" of `func`, with fixed `this=user`.
128+
Here `func.bind(user)` is a "bound variant" of `func`, with fixed `this=user`.
129129

130130
All arguments are passed to the original `func` "as is", for instance:
131131

1-js/10-error-handling/1-try-catch/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ For instance:
632632
633633
The role of the global handler `window.onerror` is usually not to recover the script execution -- that's probably impossible in case of programming errors, but to send the error message to developers.
634634
635-
There are also web-services that provide error-logging for such cases, like <https://errorception.com> or <https://www.muscula.com>.
635+
There are also web-services that provide error-logging for such cases, like <https://muscula.com> or <https://www.sentry.io>.
636636
637637
They work like this:
638638

0 commit comments

Comments
 (0)