Commit 6cd5ff9
committed
Merge branch 'master' of https://github.com/javascript-tutorial/en.javascript.info
# Conflicts:
# 1-js/01-getting-started/2-manuals-specifications/article.md
# 1-js/05-data-types/07-map-set-weakmap-weakset/article.md
# 1-js/05-data-types/10-date/3-weekday/solution.md
# 1-js/07-object-oriented-programming/06-prototype-methods/article.md
# 1-js/09-classes/01-class/article.md
# 1-js/09-classes/05-extend-natives/article.md
# 1-js/11-async/03-promise-chaining/article.md
# 1-js/12-generators-iterators/1-generators/01-pseudo-random-generator/solution.md
# 1-js/12-generators-iterators/1-generators/article.md
# 1-js/13-modules/03-modules-dynamic-imports/article.md
# 2-ui/1-document/11-coordinates/coords.png
# 2-ui/1-document/11-coordinates/coords@2x.png
# 2-ui/1-document/11-coordinates/document-window-coordinates-scroll.png
# 2-ui/1-document/11-coordinates/document-window-coordinates-scroll@2x.png
# 2-ui/1-document/11-coordinates/document-window-coordinates-zero.png
# 2-ui/1-document/11-coordinates/document-window-coordinates-zero@2x.png
# 2-ui/99-ui-misc/01-mutation-observer/article.md
# 6-data-storage/01-cookie/article.md
# 6-data-storage/02-localstorage/article.md
# 8-web-components/2-custom-elements/article.md
# 8-web-components/5-slots-composition/article.md
# 8-web-components/6-shadow-dom-style/article.md
# 8-web-components/7-shadow-dom-events/article.md
# figures.sketch100 files changed
Lines changed: 948 additions & 176 deletions
File tree
- 1-js
- 04-object-basics/01-object
- 05-data-types
- 03-string
- 07-map-set
- 01-array-unique-map
- _js.view
- 02-filter-anagrams
- _js.view
- 03-iterable-keys
- 08-weakmap-weakset
- 01-recipients-read
- 02-recipients-when-read
- 09-keys-values-entries
- 01-sum-salaries
- _js.view
- 02-count-properties
- _js.view
- 10-destructuring-assignment
- 1-destruct-user
- 6-max-salary
- _js.view
- 11-date
- 1-new-date
- 2-get-week-day
- _js.view
- 3-weekday
- _js.view
- 4-get-date-ago
- _js.view
- 5-last-day-of-month
- _js.view
- 6-get-seconds-today
- 7-get-seconds-to-tomorrow
- 8-format-date-relative
- _js.view
- 12-json
- 1-serialize-object
- 2-serialize-event-circular
- 07-object-oriented-programming/13-mixins
- 99-js-misc/01-proxy
- 01-error-nonexisting
- 02-array-negative
- 03-observable
- 2-ui
- 1-document
- 01-browser-environment
- 04-searching-elements-dom
- 05-basic-dom-node-properties
- 11-coordinates
- 2-position-at
- source.view
- 2-events
- 02-bubbling-and-capturing
- 05-dispatch-events
- 3-event-details
- 1-mouse-events-basics
- 4-mouse-drag-and-drop
- 5-network
- 10-long-polling
- longpoll.view
- 12-server-sent-events
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
109 | 108 | | |
110 | 109 | | |
111 | 110 | | |
| |||
130 | 129 | | |
131 | 130 | | |
132 | 131 | | |
133 | | - | |
| 132 | + | |
134 | 133 | | |
135 | 134 | | |
136 | 135 | | |
| |||
146 | 145 | | |
147 | 146 | | |
148 | 147 | | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
149 | 159 | | |
150 | 160 | | |
151 | 161 | | |
| |||
222 | 232 | | |
223 | 233 | | |
224 | 234 | | |
225 | | - | |
| 235 | + | |
226 | 236 | | |
227 | 237 | | |
| 238 | + | |
228 | 239 | | |
229 | 240 | | |
230 | 241 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
314 | 314 | | |
315 | 315 | | |
316 | 316 | | |
317 | | - | |
| 317 | + | |
318 | 318 | | |
319 | 319 | | |
320 | 320 | | |
| |||
345 | 345 | | |
346 | 346 | | |
347 | 347 | | |
348 | | - | |
| 348 | + | |
349 | 349 | | |
350 | 350 | | |
351 | 351 | | |
| |||
519 | 519 | | |
520 | 520 | | |
521 | 521 | | |
522 | | - | |
| 522 | + | |
523 | 523 | | |
524 | 524 | | |
525 | 525 | | |
| |||
631 | 631 | | |
632 | 632 | | |
633 | 633 | | |
634 | | - | |
635 | | - | |
| 634 | + | |
| 635 | + | |
636 | 636 | | |
637 | | - | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
638 | 640 | | |
639 | 641 | | |
640 | 642 | | |
| |||
0 commit comments