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,24 +24,42 @@ Pregledač ima ugrađen engine ponekad nazvan "JavaScript virtual machine".
 
 Različite mašine(engines) imaju različita "imena kodova". Na primer:
 
+<<<<<<< HEAD
 - [V8](https://en.wikipedia.org/wiki/V8_(JavaScript_engine)) -- u Chromu i Operi.
 - [SpiderMonkey](https://en.wikipedia.org/wiki/SpiderMonkey) -- u Firefox-u.
 - ...Postoje druga imena kodova kao  "Chakra" za Internet Explorer, "ChakraCore" za Microsoft Edge, "Nitro" i "SquirrelFish" za Safari, i td.
+=======
+- [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
 
 Dobro je zapamtiti termine iznad zato što se koriste u programerskim člancima na internetu. Mi ćemo ih koristiti takođe. Na primer, ako je "funkcija X podržano od V8", onda verovatno funkcioniše u Chrome-u i Opera-i. 
 ```smart header="How do engines work?"
 
 Engine(mašine) su komplikovane. Ali osnove su im lake.
 
+<<<<<<< HEAD
 1. Engine (embedded ako je pretraživač) čita ("parsira") skriptu.
 2. Onda prebacuje ("kompajlira") skriptu u jezik mašine.
 3. I onda kod radi, prilično brzo.
+=======
+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
 
 Engine omogućava optimizacije na svakom koraku u procesu. Čak posmatra kompajlovanu skriptu dok se izvršava, analizira podatke koji protiču kroz nju, i optimizira dalje kodove mašina zasnovane na tom znanju.
 ```
 
 
+<<<<<<< HEAD
 ## Šta in-browser JavaScript može da radi?
+=======
+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
 
 Moderan JavaScript je "siguran" programski jezik. Ne dozvoljava pristupe niskog nivoa memoriji ili CPU-u, zato što je prvenstveno napravljen za pretraživače koji to ne zahtevaju.
 
@@ -57,53 +75,86 @@ Na primer, in-browser JavaScript može da:
 - Dobija i postavlja kukije, postavlja pitanja posetiocu, pokazuje poruke.
 - Pamti informacije sa strane klijenta("local storage").
 
+<<<<<<< HEAD
 ## Šta in-browser JavaScript ne može da radi?
+=======
+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
 
 JavaScript-ove mogućnosti u pretraživaču su ograničene zbog sigurnosti korisnika. Cilj je da se spreči da zla stranica pristupi privatnim podacima ili da nanese štetu korisnikovim podacima.
 
 Primeri takvih restrikcija uključuju:
 
 - JavaScript na vebstranici ne sme da čita/piše proizvoljne datoteke na hard disku,ne sme da ih kopira ili pokreće program. Nema direktan pristup OS funkcijama.
 
+<<<<<<< HEAD
     Moderni pretraživači dozvoljavaju da radi sa datotekama, ali je pristup ograničen i samo omogućen ako korisnik radi određene akcije, na primer "spušta" fajl u prozor pretraživača ili ga selektuje putem `<input>` taga.
 
     Postoje načini za interakciju sa kamerom/mikrofonom, i ostalim uređajima, ali zahtevaju posebnu dozvolu korisnika. Tako da stranica na kojoj je omogućen JavaScript ne sme tajno da uključi Vebkameru, posmatra okolinu i šalje informacije na [NSA](https://en.wikipedia.org/wiki/National_Security_Agency).
 - Različiti tabovi/prozori inače ne znaju jedni za druge. Ponekad znaju, na primer kada jedan prozor koristi JavaScript da bi otvorio drugi. Ali čak i u ovom slučaju, JavaScript sa jedne stranice nema pristup drugoj stranici ako dolaze sa različitih sajtova (sa različitog domejna, protokola ili porta).  
+=======
+    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.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
    Ovo se zove "Same Origin Policy" (politika istog porekla). Za rad sa njom, *obe stranice* moraju da pristanu na razmenu podataka, i da sadrže poseban JavaScript kod koji podržava tu politiku. Mi ćemo pokriti to u ovom tutorijalu. 
 
    Ovo ograničenje je, ponovo ponavljamo, zbog sigurnosti korisnika. Stranica sa `http://anysite.com` koju je korisnik otvorio ne sme da ima pristup drugom pretraživaču sa ovim URL-om  `http://gmail.com` i da ukrade informacije odatle. 
 - JavaScript može lako da komunicira preko interneta do servera odakle trenutno stranica dolazi. Ali njegova mugućnost da prima podatke sa drugih sajtova/domejnova je oštećena. Ako je moguće, zahtevaće posebno odobrenje (izraženo u HTTP zaglavljima) Još jednom, to je sigurnosno ograničenje. 
 ![](limitations.svg)
 
+<<<<<<< HEAD
 takva ograničenja ne postoje ako je JavaScript korišćen van pretraživača, na pr. na sreveru. Moderni pretraživči takodje dozvoljavaju plagin ekstenzije koji služe za izdavanje dozvole.
+=======
+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
 
 ## Šta čini JavaScript jedinstvenim?
 
 Postoje najmanje tri bitne stvari o JavaScriptu: 
 ```compare
+<<<<<<< HEAD
 + Potpuna integracija sa HTML/CSS.
 + Jednostavne stvari koje se prosto izvršavaju.
 + Podrška od svih većih pretraživača i dozvola po default-u.
+=======
++ Full integration with HTML/CSS.
++ Simple things are done simply.
++ Supported by all major browsers and enabled by default.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 ```
 JavaScript je jedina brauzer tehnologija koja kombinuje ove tri stavke. 
 
 To je ono što čini JavaScript jedinstvenim. Zato je on najrasprostranjenija alatka za stvaranje pretraživačkog interfejsa. 
 
+<<<<<<< HEAD
 Ovim rečeno, JavaScript omogućuje kreiranje servera, mobilnih aplikacija, i td. 
+=======
+That said, JavaScript can be used to create servers, mobile applications, etc.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 ## Jezici "preko" JavaScript-a
 
 JavaScript sintaksa ne ispunjava svačije potrebe. Različiti ljudi zahtevaju različite stvari. 
 
 To je očekivano, zato što projekti i zahtevi tih projekata su drugačiji za sve.
 
+<<<<<<< HEAD
 Zato se skoro mnoštvo drugih jezika pojavilo, koji su konvertovani u JavaScript pre nego što se pokrenu u pretraživaču.
+=======
+So, recently a plethora of new languages appeared, which are *transpiled* (converted) to JavaScript before they run in the browser.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Moderne alatke stvaraju konvertovanje veoma brzim i lakim, zapravo dozvoljavaju programerima da kreiraju kod u drugom jeziku auto-konvertujući njegovu suštinu.
 
 Primeri takvih jezika:
 
+<<<<<<< HEAD
 - [CoffeeScript](http://coffeescript.org/) je "sintetički šećer" za JavaScript. Upoznaje nas sa kraćom sintaksom, dozvoljavajući nam da pišemo čistije i preciznije kodove. Inače *Rubi* developeri ga vole.
 - [TypeScript](http://www.typescriptlang.org/) je koncentrisan na dodavanje "strogog pisanje podataka" da bi pojednostavilo razvijanje i podršku kompleksnih sistema. Razvijen je od strane Microsoft-a.
 - [Flow](http://flow.org/) takođe dodaje pisanje podataka, ali na drugi način. Razvijen od Fejsbuk-a.
@@ -112,9 +163,25 @@ Primeri takvih jezika:
 - [Kotlin](https://kotlinlang.org/docs/reference/js-overview.html) je moderan, sažet i siguran programski jezik koji cilja na pretraživač ili Node. 
 
 Ima ih više. Naravno, čak iako smo se navikli na neki od konvertovanih jezika, trebali bismo da poznajemo JavaScript da bismo stvarno razumeli šta činimo.
+=======
+- [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
 
 ## Rezime
 
+<<<<<<< HEAD
 - JavaScript je prvobitno stvoren kao jezik samo za pretraživače, ali se sada koristi i u mnogim drugim okruženjima.
 - Danas, JavaScript ima jedinstvenu poziciju kao najprihvaćeniji pretraživački jezik potpuno integrisan u HTML/CSS.
 - Postoje mnogi jezici koji su "pretočeni" u JavaScript i daju razne mogućnosti. Preporučujemo da ih istražite, barem nakon usavršavanja JavaScript-a.
+=======
+- 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

@@ -1,15 +1,15 @@
 
 # Manuals and specifications
 
-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 sources.
+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.
 
 ## Specification
 
 [The ECMA-262 specification](https://www.ecma-international.org/publications/standards/Ecma-262.htm) contains the most in-depth, detailed and formalized information about JavaScript. It defines the language.
 
 But being that formalized, it's difficult to understand at first. So if you need the most trustworthy source of information about the language details, the specification is the right place. But it's not for everyday use.
 
-A new specification version is released every year. In-between these releases, the latest specification draft is at <https://tc39.es/ecma262/>.
+A new specification version is released every year. Between these releases, the latest specification draft is at <https://tc39.es/ecma262/>.
 
 To read about new bleeding-edge features, including those that are "almost standard" (so-called "stage 3"), see proposals at <https://github.com/tc39/proposals>.
 
@@ -19,19 +19,19 @@ Also, if you're developing for the browser, then there are other specifications
 
 - **MDN (Mozilla) JavaScript Reference** is the main manual with examples and other information. It's great to get in-depth information about individual language functions, methods etc.
 
-    One can find it at <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference>.
+    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 `parseInt` function.
+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.
 
 ## Compatibility tables
 
 JavaScript is a developing language, new features get added regularly.
 
 To see their support among browser-based and other engines, see:
 
-- <http://caniuse.com> - per-feature tables of support, e.g. to see which engines support modern cryptography functions: <http://caniuse.com/#feat=cryptography>.
+- <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.
+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.

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

@@ -13,7 +13,7 @@ An IDE loads the project (which can be many files), allows navigation between fi
 If you haven't selected an IDE yet, consider the following options:
 
 - [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free).
-- [WebStorm](http://www.jetbrains.com/webstorm/) (cross-platform, paid).
+- [WebStorm](https://www.jetbrains.com/webstorm/) (cross-platform, paid).
 
 For Windows, there's also "Visual Studio", not to be confused with "Visual Studio Code". "Visual Studio" is a paid and mighty Windows-only editor, well-suited for the .NET platform. It's also good at JavaScript. There's also a free version [Visual Studio Community](https://www.visualstudio.com/vs/community/).
 
@@ -29,13 +29,11 @@ The main difference between a "lightweight editor" and an "IDE" is that an IDE w
 
 In practice, lightweight editors may have a lot of plugins including directory-level syntax analyzers and autocompleters, so there's no strict border between a lightweight editor and an IDE.
 
-The following options deserve your attention:
+There are many options, for instance:
 
-- [Atom](https://atom.io/) (cross-platform, free).
-- [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free).
-- [Sublime Text](http://www.sublimetext.com) (cross-platform, shareware).
+- [Sublime Text](https://www.sublimetext.com/) (cross-platform, shareware).
 - [Notepad++](https://notepad-plus-plus.org/) (Windows, free).
-- [Vim](http://www.vim.org/) and [Emacs](https://www.gnu.org/software/emacs/) are also cool if you know how to use them.
+- [Vim](https://www.vim.org/) and [Emacs](https://www.gnu.org/software/emacs/) are also cool if you know how to use them.
 
 ## Let's not argue
 
@@ -44,3 +42,8 @@ The editors in the lists above are those that either I or my friends whom I cons
 There are other great editors in our big world. Please choose the one you like the most.
 
 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).

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

@@ -8,7 +8,7 @@ To see errors and get a lot of other useful information about scripts, "develope
 
 Most developers lean towards Chrome or Firefox for development because those browsers have the best developer tools. Other browsers also provide developer tools, sometimes with special features, but are usually playing "catch-up" to Chrome or Firefox. So most developers have a "favorite" browser and switch to others if a problem is browser-specific.
 
-Developer tools are potent, they have many features. To start, we'll learn how to open them, look at errors, and run JavaScript commands.
+Developer tools are potent; they have many features. To start, we'll learn how to open them, look at errors, and run JavaScript commands.
 
 ## Google Chrome
 
@@ -22,7 +22,7 @@ The developer tools will open on the Console tab by default.
 
 It looks somewhat like this:
 
-![chrome](chrome.png)
+![chrome](chrome.webp)
 
 The exact look of developer tools depends on your version of Chrome. It changes from time to time but should be similar.
 
@@ -49,7 +49,7 @@ The look & feel of them is quite similar. Once you know how to use one of these
 
 Safari (Mac browser, not supported by Windows/Linux) is a little bit special here. We need to enable the "Develop menu" first.
 
-Open Preferences and go to the "Advanced" pane. There's a checkbox at the bottom:
+Open Settings and go to the "Advanced" pane. There's a checkbox at the bottom:
 
 ![safari](safari.png)