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

@@ -42,27 +42,47 @@ Spletni brskalniki uporabljajo različna imena za JavaScript engine:
 - [WebKit](<https://en.wikipedia.org/wiki/Safari_(web_browser)>) -- Safari
 - ...Obstajajo še druga imena kot je "ChakraCore" za Microsoft Edge ipd.
 
+<<<<<<< HEAD
 Zgornja poimenovanja si velja zapomniti saj se velikokrat pojavijo v raznih
 člankih razvijalcev, kjer jih navadno omenjajo kadar govorijo o podpori določene
 funkcionalnosti. Na primer: "lastnost X je podprta na V8", kar pomeni, da to
 lastnost lahko uporabimo na brskalnikih Chrome in Opera.
 
 ```smart header="Kako delujejo programski stroji (angl. *engines*)?"
+=======
+- [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
 
 Programski stroji so precej zahtevni za razumevanje. A osnove so enostavne.
 
 1. Programski stroj prebere (angl.*parses*) skripto (v JavaScript je programski stroj največkrat kar vgrajen v spletni brskalnik, če se izvaja v spletni aplikaciji).
 2. Nato jo prevede (angl. *compiles*) v strojni jezik.
 3. Sledi izvedbe strojne kode, ki deluje zelo hitro.
 
+<<<<<<< HEAD
 Programski stroji opravijo dodatne optimizacije ob vsakem koraku v danem procesu. Pravtako imajo možnost opazovanja in analiziranje prevedene skripte, ki se poganja, in s tem dodatno optimizira strojno kodo glede na najdbe.
+=======
+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.
+
+The engine applies optimizations at each step of the process. It even watches the compiled script as it runs, analyzes the data that flows through it, and further optimizes the machine code based on that knowledge.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 ```
 
 ## Kaj lahko stori JavaScript, ki se izvede v spletnem brskalniku?
 
+<<<<<<< HEAD
 Sodobni JavaScript je "varen" programski jezik. To pomeni, da ne ponuja možnosti
 dostopa do nizko-nivojskih funkcij spomina ali CPE, saj je bil inicialno
 ustvarjen za spletne brskalnike, ki pa tega ne potrebujejo.
+=======
+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
 
 Sposobnosti JavaScript-a so močno odvisne od okolja v katerem se poganja. Na
 primer [Node.js](https://wikipedia.org/wiki/Node.js) podpira funkcije, ki
@@ -89,7 +109,11 @@ Omejitve JavaScript-a, ki se izvaja v spletnem brskalniku so predvsem zaradi
 varnosti uporabnika. Cilj je preprečiti zlonamernim spletnim stranem dostop do
 ali neželjeno manipulacijo zasebnih podatkov uporabnika.
 
+<<<<<<< HEAD
 Primeri takih omejitev vključujejo:
+=======
+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 na spletni strani ne more brati/pisati/kopirati ali izvajati
   poljubnih datotek na trdem disku. Nima neposrednega dostopa do funkcij
@@ -107,6 +131,7 @@ Primeri takih omejitev vključujejo:
 
 Izjeme:
 
+<<<<<<< HEAD
 - Sodobni brskalniki do določene mere dovolijo delo z datotekami, vendar dostop
   je omejen ter omogoče le če uporabnik naredi določeno akcijo kot je npr.:
   nalaganje datoteke v brskalnik preko "drop" funkcionalnosti ali pa preko
@@ -122,23 +147,48 @@ Izjeme:
 Takšne omejitve ne obstajajo, če se JavaScript požene izven brskalnika (na
 primer na strežniku). Sodobni brskalniki pravtako omogočajo vtičnike, ki lahko
 zahtevajo za dodatna dovoljenja.
+=======
+    Modern browsers allow it to work with files, but the access is limited and only provided if the user does certain actions, like "dropping" a file into a browser window or selecting it via an `<input>` tag.
+
+    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
 
 ## Kaj je unikatnega pri JavaScript-u?
 
 Obstajajo vsaj _tri_ odlične stvari o JavaScript-u:
 
 ```compare
+<<<<<<< HEAD
 + Popolna integracija s HTML in CSS.
 + Enostavne stvari so izvedene preprosto.
 + Podpora v vseh glavnih brskalnikih, kjer je tudi samodejno omogočen.
+=======
++ Full integration with HTML/CSS.
++ Simple things are done simply.
++ Supported by all major browsers and enabled by default.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 ```
 
 JavaScript je edina tehnologija v brskalnikih ki omogoča vse troje hkrati in to
 naredi JavaScript unikatnega. Zaradi tega je najbolj uporabljeno orodje za
 ustvarjanje brskalniških vmesnikov.
 
+<<<<<<< HEAD
 Z JavaScript lahko pravtako razvijamo spletne strežnike, mobilne aplikacije,
 itd.
+=======
+That said, JavaScript can be used to create servers, mobile applications, etc.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 ## Programski jeziki, katerih se prevedejo v JavaScript
 
@@ -149,9 +199,13 @@ različne za vsakogar.
 Tako se je nedavno razvilo ogromno število novih programskih jezikov, ki se na
 koncu prevedejo v JavaScript, preden se izvedejov spletnem brskalniku.
 
+<<<<<<< HEAD
 Sodobna orodja omogočajo zelo hitro in transparentno prevajanje, kar omogoča
 razvijalcem programiranje v drugem programskem jeziku, vmes pa se le-ta
 avtomatično prevaja v JavaScript.
+=======
+So, recently a plethora of new languages appeared, which are *transpiled* (converted) to JavaScript before they run in the browser.
+>>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
 
 Nekaj primerov takšnih programskih jezikov:
 
@@ -173,6 +227,7 @@ Nekaj primerov takšnih programskih jezikov:
   jedrnat in varen programski jezik, ki se lahko tudi uporablja za razvoj
   spletnih aplikacij ali strežnikov.
 
+<<<<<<< HEAD
 Obstaja jih še več. Kljub temu, da obstaja več prevedenih programskih jezikov za
 JavaScript, je le-ta tisti, ki se na koncu izvede torej je potrebno dobro znanje
 samega JavaScript-a za dosledno razumevanje naših aplikacij.
@@ -186,3 +241,19 @@ samega JavaScript-a za dosledno razumevanje naših aplikacij.
 - Obstaja veliko programskih jezikov ki se prevedejo v JavaScript in ponujajo
   določene funkcionalnosti. Po spoznavanju JavaScript-a ja zaželjeno, da se
   spoznamo tudi s kakšnim izmed njih.
+=======
+- [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.
+
+## Summary
+
+- 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)