merging all conflicts

Author: iliakan

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: iliakan

.gitignore

@@ -21,3 +21,4 @@ sftp-config.json
 Thumbs.db
 
 
+/svgs

1-js/01-getting-started/1-intro/article.md

@@ -24,26 +24,44 @@ Brauzerlar o'z JavaScript interpretatorlariga ega, ular gohida "JavaScript virtu
 
 Har bir intetptretatorni o'z nomi mavjud. Masalan:
 
+<<<<<<< HEAD
 - [V8](<https://en.wikipedia.org/wiki/V8_(JavaScript_engine)>) -- Chrome va Opera brauzerlarida qo'llanadi.
 - [SpiderMonkey](https://en.wikipedia.org/wiki/SpiderMonkey) -- Firefox brauzerida.
 - Explorer brauzerining turli xil versiyalari uchun "Trident" va "Chakra", Microsoft Edge uchun "ChakraCore", Safari uchun "Nitro" va "SquirrelFish" va boshqalar kabi boshqa kod nomlari mavjud.
 
 Yuqoridagi atamalarni eslab qolish yaxshi, chunki ular netdagi ishlab chiquvchilar maqolalarida qo'llaniladi. Biz ulardan ham foydalanamiz. Masalan, agar "X funktsiyasini V8 qo'llab-quvvatlasa", ehtimol u Chrome va Opera-da ishlaydi.
+=======
+- [V8](https://en.wikipedia.org/wiki/V8_(JavaScript_engine)) -- in Chrome, Opera and Edge.
+- [SpiderMonkey](https://en.wikipedia.org/wiki/SpiderMonkey) -- in Firefox.
+- ...There are other codenames like "Chakra" for IE, "JavaScriptCore", "Nitro" and "SquirrelFish" for Safari, etc.
+
+The terms above are good to remember because they are used in developer articles on the internet. We'll use them too. For instance, if "a feature X is supported by V8", then it probably works in Chrome, Opera and Edge.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 ```smart header="Intetptretatorlar ishni qanday bajarishadi?"
 
 Intetptretatorlar murakkab. Ammo asoslari oson.
 
+<<<<<<< HEAD
 1. Intetptretator (agar u brauzer bo'lsa, avtomatik o'rnatilgan) skriptni o'qiydi ("tahlil qiladi").
 2. Keyin u skriptni mashina tiliga o'zgartiradi ("kompilyatsiya qiladi").
 3. Va keyin mashina kodi juda tez ishlaydi.
+=======
+1. The engine (embedded if it's a browser) reads ("parses") the script.
+2. Then it converts ("compiles") the script to machine code.
+3. And then the machine code runs, pretty fast.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Interpretatatsiya jarayonning har bir bosqichida optimallashtirishlarni qo'llaydi. U hattoki kompilyatsiya qilingan skriptni ishlayotganda kuzatib boradi, u orqali oqib o'tadigan ma'lumotlarni tahlil qiladi va shu bilimga asoslangan holda mashina kodiga optimallashtirishlarni qo'llaydi. Tugatgandan so'ng, skriptlar juda tez ishlaydi.
 ```
 
 ## Brauzerdagi JavaScript nimani bajara oladi?
 
+<<<<<<< HEAD
 Zamonaviy JavaScript - bu "xavfsiz" dasturlash tili. Bu xotira yoki protsessorga(CPU) past darajadagi kirishni ta'minlamaydi, chunki dastlab uni talab qilmaydigan brauzerlar uchun yaratilgan.
+=======
+Modern JavaScript is a "safe" programming language. It does not provide low-level access to memory or the CPU, because it was initially created for browsers which do not require it.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 JavaScript-ning imkoniyatlari u ishlayotgan muhitga juda bog'liq. Masalan, [Node.js](https://wikipedia.org/wiki/Node.js) JavaScript-ga o'zboshimchalik bilan fayllarni o'qish / yozish, tarmoq so'rovlarini bajarish va hk.
 
@@ -59,14 +77,19 @@ Masalan:
 
 ## JavaScript-da brauzerda nima qila olmaysiz?
 
+<<<<<<< HEAD
 JavaScript-ning brauzerdagi imkoniyatlari foydalanuvchi xavfsizligi uchun cheklangan. Maqsad yomon veb-sahifaning shaxsiy ma'lumotlarga kirishini yoki foydalanuvchi ma'lumotlariga zarar etkazishini oldini olishdir.
+=======
+JavaScript's abilities in the browser are limited to protect the user's safety. The aim is to prevent an evil webpage from accessing private information or harming the user's data.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Bunday cheklovlarga quyidagilar kiradi:
 
 - Veb-sahifadagi JavaScript-ni qattiq diskdagi o'zboshimchalik bilan fayllarni o'qish / yozish, ularni nusxalash yoki dasturlarni bajarish mumkin emas. Uning OS tizimi funktsiyalariga to'g'ridan-to'g'ri kirish imkoniyati yo'q.
 
   Zamonaviy brauzerlar unga fayllar bilan ishlashga imkon beradi, lekin kirish cheklangan va faqat foydalanuvchi brauzer oynasiga faylni "tushirish" yoki uni `<input>` yorlig'i orqali tanlash kabi ba'zi bir amallarni bajargan taqdirdagina taqdim etiladi.
 
+<<<<<<< HEAD
   Kamera/mikrofon va boshqa qurilmalar bilan o'zaro aloqa qilish usullari mavjud, ammo ular foydalanuvchidan aniq ruxsat talab qiladi. Shunday qilib, JavaScript-ni qo'llab-quvvatlaydigan sahifa veb-kamerani yashirincha yoqmasligi, atrofni kuzatishi va ma'lumotni [NSA](https://en.wikipedia.org/wiki/National_Security_Agency) ga yuborishi mumkin emas.
 
 - Turli xil yorliqlar/oynalar odatda bir-birlarini bilishmaydi. Ba'zan ular bilishadi, masalan, bitta oyna ikkinchisini ochish uchun JavaScript-ni ishlatganda. Ammo bu holatda ham bitta sahifadagi JavaScript-ni boshqa saytlarga kirish mumkin emas, agar ular turli saytlardan (boshqa domendan, protokoldan yoki portdan) bo'lsa.
@@ -80,43 +103,88 @@ Bunday cheklovlarga quyidagilar kiradi:
 ![](limitations.svg)
 
 Agar JavaScript brauzerdan tashqarida, masalan serverda ishlatilsa, bunday cheklovlar mavjud emas. Zamonaviy brauzerlar kengaytirilgan ruxsat so'rashi mumkin bo'lgan plagin / kengaytmalarga ham imkon beradi.
+=======
+    There are ways to interact with the camera/microphone and other devices, but they require a user's explicit permission. So a JavaScript-enabled page may not sneakily enable a web-camera, observe the surroundings and send the information to the [NSA](https://en.wikipedia.org/wiki/National_Security_Agency).
+- Different tabs/windows generally do not know about each other. Sometimes they do, for example when one window uses JavaScript to open the other one. But even in this case, JavaScript from one page may not access the other page if they come from different sites (from a different domain, protocol or port).
+
+    This is called the "Same Origin Policy". To work around that, *both pages* must agree for data exchange and must contain special JavaScript code that handles it. We'll cover that in the tutorial.
+
+    This limitation is, again, for the user's safety. A page from `http://anysite.com` which a user has opened must not be able to access another browser tab with the URL `http://gmail.com`, for example, and steal information from there.
+- JavaScript can easily communicate over the net to the server where the current page came from. But its ability to receive data from other sites/domains is crippled. Though possible, it requires explicit agreement (expressed in HTTP headers) from the remote side. Once again, that's a safety limitation.
+
+![](limitations.svg)
+
+Such limitations do not exist if JavaScript is used outside of the browser, for example on a server. Modern browsers also allow plugins/extensions which may ask for extended permissions.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 ## JavaScript-ni qaysi xususiyatlari uni noyob qiladi?
 
 JavaScript hech bo'lmaganda _uchta_ ajoyib xususiyatga ega:
 
+<<<<<<< HEAD
 ```solishtiring
 + HTML va CSS bilan to'liq integratsiyasi.
 + Oson ishlar osongina amalga oshiriladi.
 + Barcha asosiy brauzerlar tomonidan qo'llab-quvvatlanadi va ularda standart sifatida yoqilgan.
+=======
+```compare
++ Full integration with HTML/CSS.
++ Simple things are done simply.
++ Supported by all major browsers and enabled by default.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 ```
 
 JavaScript - bu uchta narsani birlashtirgan yagona brauzer texnologiyasidir.
 
+<<<<<<< HEAD
 Bu JavaScript-ni noyob qiladi. Shuning uchun u brauzer feyslarini yaratishda eng keng tarqalgan vositadir.
+=======
+That said, JavaScript can be used to create servers, mobile applications, etc.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Yangi texnologiyani o'rganishni rejalashtirayotib, uning istiqbollarini tekshirish ham muhimdir. Keling, zamonaviy tendentsiyalarga o'taylik.
 
 ## JavaScript "ustidan" qo'llanadigan tillar
 
 JavaScript-ning sintaksisi hammaning ehtiyojlariga mos kelmaydi. Turli odamlar turli xususiyatlarni xohlashadi.
 
+<<<<<<< HEAD
 Bu kutilgan hodisa bo'lishi kerak edi, chunki loyihalar va talablar har bir kishi uchun farq qiladi.
+=======
+So, recently a plethora of new languages appeared, which are *transpiled* (converted) to JavaScript before they run in the browser.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Shunday qilib, yaqinda juda ko'p yangi tillar paydo bo'ldi va brauzer ularni ishlatishdan oldin JavaScript-ga aylantirib bajaradi.
 
 Zamonaviy asboblar transpilatsiyani juda tez va shaffof bajaradi, aslida dasturchilar kodni bitta tilda yozganda, ular uni avtomatik tarzda boshqa tilga aylantirish imkonini beradi.
 
+<<<<<<< HEAD
 Bunday tillarning namunalari:
 
 - [CoffeeScript](http://coffeescript.org/) JavaScript uchun "sintaktik shakar" dir. Ushbu til bizga qisqa sintaksisni va aniqroq kodni taqdim etadi. Odatda, Ruby dasurchilari shu tilni afzal ko'rishadi.
 - [TypeScript](http://www.typescriptlang.org/) murakkab tizimlarni ishlab chiqish, soddalashtirish va qo'llab-quvvatlash uchun "strict data typing"ni qo'shishga qaratilgan. Microsoft tomonidan ishlab chiqilgan.
 - [Dart](https://www.dartlang.org/) brauzer bo'lmagan muhitda (mobil ilovalar kabi) ishlaydigan o'z dvigateliga ega bo'lgan mustaqil til. Bu dastlab JavaScript uchun zaxira sifatida Google tomonidan taklif etildi, lekin hozirgi paytda, brauzerlar shu tilni ham JS-ga transpilatsiya bo'lishini talab qilishadi.
+=======
+- [CoffeeScript](https://coffeescript.org/) is "syntactic sugar" for JavaScript. It introduces shorter syntax, allowing us to write clearer and more precise code. Usually, Ruby devs like it.
+- [TypeScript](https://www.typescriptlang.org/) is concentrated on adding "strict data typing" to simplify the development and support of complex systems. It is developed by Microsoft.
+- [Flow](https://flow.org/) also adds data typing, but in a different way. Developed by Facebook.
+- [Dart](https://www.dartlang.org/) is a standalone language that has its own engine that runs in non-browser environments (like mobile apps), but also can be transpiled to JavaScript. Developed by Google.
+- [Brython](https://brython.info/) is a Python transpiler to JavaScript that enables the writing of applications in pure Python without JavaScript.
+- [Kotlin](https://kotlinlang.org/docs/reference/js-overview.html) is a modern, concise and safe programming language that can target the browser or Node.
+
+There are more. Of course, even if we use one of these transpiled languages, we should also know JavaScript to really understand what we're doing.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Bundan ham ko'proq tillar mavjud. Albatta, biz bu tillardan birini ishlatsak ham, biz nima qilayotganimizni tushunish uchun JavaScript-ni bilishimiz kerak.
 
+<<<<<<< HEAD
 ## Xulosa
 
 - JavaScript dastlab brauzer tili sifatida yaratilgan, ammo hozirgi paytda ko'pgina boshqa muhitlarda ham qo'llanilmoqda.
 - Bugun JavaScript HTML/CSS bilan to'la integratsiyalashgan va eng keng tarqalgan brauzer tili hisoblanadi.
 - JavaScript-ga "aylanadigan" va muayyan xususiyatlarni taqdim etadigan ko'plab tillar mavjud. Javascriptni o'zlashtirgandan so'ng kamida qisqacha ularga bir nazar tashlash tavsiya etiladi.
+=======
+- JavaScript was initially created as a browser-only language, but it is now used in many other environments as well.
+- Today, JavaScript has a unique position as the most widely-adopted browser language, fully integrated with HTML/CSS.
+- There are many languages that get "transpiled" to JavaScript and provide certain features. It is recommended to take a look at them, at least briefly, after mastering JavaScript.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3

1-js/01-getting-started/2-manuals-specifications/article.md

@@ -2,15 +2,23 @@
 
 Bu kitob *qo'llanma*dir. U sizga tilni bosqichma-bosqich o'rganishda yordam berish maqsadida yozilgan. Ammo asoslar bilan tanishgandan so'ng, sizga boshqa manbalar kerak bo'ladi.
 
+<<<<<<< HEAD
 ## Xususiyat
+=======
+This book is a *tutorial*. It aims to help you gradually learn the language. But once you're familiar with the basics, you'll need other resources.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 [ECMA-262 xususiyatsi](https://www.ecma-international.org/publications/standards/Ecma-262.htm) JavaScript haqida eng chuqur, batafsil va rasmiy ma'lumotlarni o'z ichiga oladi. U tilni belgilaydi.
 
 Ammo shunchalik rasmiy bo'lganligi sababli, dastlab tushunish qiyin. Shuning uchun agar sizga til tafsilotlari haqida eng ishonchli ma'lumot manbai kerak bo'lsa, xususiyat to'g'ri joy. Ammo u kundalik foydalanish uchun emas.
 
 Har yili yangi xususiyat versiyasi chiqariladi. Bu nashrlar orasida eng so'nggi xususiyat loyihasi <https://tc39.es/ecma262/> da joylashgan.
 
+<<<<<<< HEAD
 "Deyarli standart" deb ataladigan ("3-bosqich") xususiyatlarni o'z ichiga olgan yangi ilg'or xususiyatlar haqida o'qish uchun <https://github.com/tc39/proposals> dagi takliflarni ko'ring.
+=======
+A new specification version is released every year. Between these releases, the latest specification draft is at <https://tc39.es/ecma262/>.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Shuningdek, agar siz brauzer uchun ishlab chiqayotgan bo'lsangiz, qo'llanmaning [ikkinchi qismida](info:browser-environment) yoritilgan boshqa xususiyatlar ham mavjud.
 
@@ -20,9 +28,15 @@ Shuningdek, agar siz brauzer uchun ishlab chiqayotgan bo'lsangiz, qo'llanmaning
 
   Uni <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference> da topishingiz mumkin.
 
+<<<<<<< HEAD
 Garchi ko'pincha internet qidiruvidan foydalanish yaxshiroqdir. So'rovda "MDN [atama]" dan foydalaning, masalan `parseInt` funksiyasini qidirish uchun <https://google.com/search?q=MDN+parseInt>.
 
 ## Moslik jadvallari
+=======
+    You can find it at <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference>.
+
+Although, it's often best to use an internet search instead. Just use "MDN [term]" in the query, e.g. <https://google.com/search?q=MDN+parseInt> to search for the `parseInt` function.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 JavaScript rivojlanayotgan til, yangi xususiyatlar muntazam ravishda qo'shiladi.
 
@@ -31,6 +45,15 @@ Brauzer va boshqa dvigatellar orasidagi qo'llab-quvvatlashni ko'rish uchun:
 - <http://caniuse.com> - xususiyat bo'yicha qo'llab-quvvatlash jadvallari, masalan zamonaviy kriptografiya funksiyalarini qaysi dvigatellar qo'llab-quvvatlashini ko'rish uchun: <http://caniuse.com/#feat=cryptography>.
 - <https://kangax.github.io/compat-table> - til xususiyatlari va ularni qo'llab-quvvatlovchi yoki qo'llab-quvvatlamaydigan dvigatellar jadvali.
 
+<<<<<<< HEAD
 Bu manbalarning barchasi real hayotdagi ishlab chiqishda foydali, chunki ular til tafsilotlari, ularning qo'llab-quvvatlanishi va hokazo haqida qimmatli ma'lumotlarni o'z ichiga oladi.
 
 Muayyan xususiyat haqida chuqur ma'lumotga ehtiyoj sezganingizda, ularni (yoki ushbu sahifani) eslab qoling.
+=======
+- <https://caniuse.com> - per-feature tables of support, e.g. to see which engines support modern cryptography functions: <https://caniuse.com/#feat=cryptography>.
+- <https://kangax.github.io/compat-table> - a table with language features and engines that support those or don't support.
+
+All these resources are useful in real-life development, as they contain valuable information about language details, their support, etc.
+
+Please remember them (or this page) for the cases when you need in-depth information about a particular feature.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3

1-js/01-getting-started/3-code-editors/article.md

@@ -12,8 +12,13 @@ IDE loyihani yuklaydi (bu juda ko'p fayl bo'lishi mumkin), fayllar o'rtasida nav
 
 Agar siz IDE ni tanlamagan bo'lsangiz, quyidagi variantlarni ko'rib chiqing:
 
+<<<<<<< HEAD
 - [Visual Studio Code](https://code.visualstudio.com/) (o'zaro faoliyatli platforma, bepul).
 - [WebStorm](http://www.jetbrains.com/webstorm/) (o'zaro faoliyatli platforma, pullik).
+=======
+- [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free).
+- [WebStorm](https://www.jetbrains.com/webstorm/) (cross-platform, paid).
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Windows uchun "Visual Studio" ham mavjud, "Visual Studio Code" bilan aralashmaslik kerak. "Visual Studio" - bu pullik va qudratli Windows muharriri .NET platformasi uchun juda mos keladi. Bundan tashqari, JavaScript-da yaxshi. Bepul versiyasi ham mavjud [Visual Studio Community](https://www.visualstudio.com/vs/community/).
 
@@ -29,17 +34,34 @@ Ular asosan faylni bir zumda ochish va tahrirlash uchun ishlatiladi.
 
 Amalda yengil muharrirlarda juda ko'p plaginlar bo'lishi mumkin, shu jumladan direktoriya-darajasidagi sintaksis analizatorlari va avtokompleterlar, shuning uchun engil muharrir va IDE o'rtasida qat'iy chegara yo'q.
 
+<<<<<<< HEAD
 Quyidagi variantlar sizning e'tiboringizga loyiqdir:
 
 - [Atom](https://atom.io/) (o'zaro faoliyatli platforma, bepul).
 - [Sublime Text](http://www.sublimetext.com) (o'zaro faoliyatli platforma, shartli ravishda bepul).
 - [Notepad++](https://notepad-plus-plus.org/) (Windows, bepul).
 - [Vim](http://www.vim.org/) va [Emacs](https://www.gnu.org/software/emacs/) ham zo'r agar ularni qanday foydalanishni bilsangiz.
+=======
+There are many options, for instance:
+
+- [Sublime Text](https://www.sublimetext.com/) (cross-platform, shareware).
+- [Notepad++](https://notepad-plus-plus.org/) (Windows, free).
+- [Vim](https://www.vim.org/) and [Emacs](https://www.gnu.org/software/emacs/) are also cool if you know how to use them.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 ## Tortishmaylik
 
 Yuqoridagi ro'yxatlardagi muharrirlarni men yoki men yaxshi dasturchi deb hisoblaydigan do'stlarim uzoq vaqt davomida foydalanishgan va baxtli bo'lganlar.
 
 Bizning katta dunyoda boshqa yaxshi kod muharrirlari ham bor. Iltimos, o'zingizga eng yoqqanini tanlang.
 
+<<<<<<< HEAD
 Kod muharririni tanlash, boshqa har qanday vosita kabi, individual va loyihalar, odatlar, va shaxsiy xohishlarga bog'liq.
+=======
+The choice of an editor, like any other tool, is individual and depends on your projects, habits, and personal preferences.
+
+The author's personal opinion:
+
+- I'd use [Visual Studio Code](https://code.visualstudio.com/) if I develop mostly frontend.
+- Otherwise, if it's mostly another language/platform and partially frontend, then consider other editors, such as XCode (Mac), Visual Studio (Windows) or Jetbrains family (Webstorm, PHPStorm, RubyMine etc, depending on the language).
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3

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

@@ -22,7 +22,7 @@ Dasturchilar uchun vositalar standart ravishda Console yorlig'ida ochiladi.
 
 Bu shunday ko'rinadi:
 
-![chrome](chrome.png)
+![chrome](chrome.webp)
 
 Dasturchilar vositalarining aniq ko'rinishi sizning Chrome versiyangizga bog'liq. U vaqti-vaqti bilan o'zgarib turadi, ammo shunga o'xshash bo'lishi kerak.
 
@@ -49,7 +49,11 @@ Ularning tashqi ko'rinishi va hissi o'xshash. Ushbu vositalardan birini qanday i
 
 Safari (Windows/Linux tomonidan qo'llab-quvvatlanmaydigan Mac brauzeri) bu yerda biroz o'ziga xosdir. Avval "Dasturchi menyusini" yoqishimiz kerak.
 
+<<<<<<< HEAD
 Preferences ni oching va "Advanced" oynasiga o'ting. Pastki qismida belgilash katakchasi mavjud:
+=======
+Open Settings and go to the "Advanced" pane. There's a checkbox at the bottom:
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 ![safari](safari.png)