Skip to content

Commit 5386811

Browse files
committed
merging all conflicts
2 parents 8647eb5 + 540d753 commit 5386811

File tree

10 files changed

+8
-4
lines changed

10 files changed

+8
-4
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
شتێکی لەم شێوەیە دەچێت:
2525

26-
![chrome](chrome.png)
26+
![chrome](chrome.webp)
2727

2828
دەرکەوتنی ئامرازەکانی گەشەپێدەر بەندە بە وەشانی کرۆمەکەتەوە. جار جار دەگۆڕێت بەڵام دەبێ هاوشێوە بێت.
2929

@@ -51,7 +51,11 @@
5151

5252
سەفاری (کە لەلایەن ویندۆز/لینوکسەوە پشتگیری ناکرێ) لێرەدا کەمێک تایبەتە. سەرەتا پێویستە "مێنۆی پەرەپێدان" چالاک بکەین.
5353

54+
<<<<<<< HEAD
5455
Preferences بکەرەوە و بچۆ بۆ لاپەڕەی "Advanced". لە خوارەوە بۆکسێکی هەڵبژاردن هەیە:
56+
=======
57+
Open Settings and go to the "Advanced" pane. There's a checkbox at the bottom:
58+
>>>>>>> 540d753e90789205fc6e75c502f68382c87dea9b
5559
5660
![safari](safari.png)
5761

-41.1 KB
Binary file not shown.
22.2 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
83 KB
Loading
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)