Skip to content

Commit 3db0ce2

Browse files
authored
Merge pull request #120 from javascript-tutorial/sync-9e3fa135
Sync with upstream @ 9e3fa13
2 parents 86ddf9a + e29b9e3 commit 3db0ce2

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

1-js/02-first-steps/18-javascript-specials/article.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ More in: <info:variables> and <info:types>.
103103

104104
We're using a browser as a working environment, so basic UI functions will be:
105105

106-
[`prompt(question, [default])`](mdn:api/Window/prompt)
106+
[`prompt(question, [default])`](https://developer.mozilla.org/en-US/docs/Web/API/Window/prompt)
107107
: Ask a `question`, and return either what the visitor entered or `null` if they clicked "cancel".
108108

109-
[`confirm(question)`](mdn:api/Window/confirm)
109+
[`confirm(question)`](https://developer.mozilla.org/en-US/docs/Web/API/Window/confirm)
110110
: Ask a `question` and suggest to choose between Ok and Cancel. The choice is returned as `true/false`.
111111

112-
[`alert(message)`](mdn:api/Window/alert)
112+
[`alert(message)`](https://developer.mozilla.org/en-US/docs/Web/API/Window/alert)
113113
: Output a `message`.
114114

115115
All these functions are *modal*, they pause the code execution and prevent the visitor from interacting with the page until they answer.
@@ -144,7 +144,7 @@ Assignments
144144
: There is a simple assignment: `a = b` and combined ones like `a *= 2`.
145145

146146
Bitwise
147-
: Bitwise operators work with 32-bit integers at the lowest, bit-level: see the [docs](mdn:/JavaScript/Guide/Expressions_and_Operators#bitwise_operators) when they are needed.
147+
: Bitwise operators work with 32-bit integers at the lowest, bit-level: see the [docs](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators#bitwise_operators) when they are needed.
148148

149149
Conditional
150150
: The only operator with three parameters: `cond ? resultA : resultB`. If `cond` is truthy, returns `resultA`, otherwise `resultB`.

1-js/05-data-types/04-array/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The "trailing comma" style makes it easier to insert/remove items, because all l
9898

9999
Let's say we want the last element of the array.
100100

101-
Some programming languages allow to use negative indexes for the same purpose, like `fruits[-1]`.
101+
Some programming languages allow the use of negative indexes for the same purpose, like `fruits[-1]`.
102102

103103
Although, in JavaScript it won't work. The result will be `undefined`, because the index in square brackets is treated literally.
104104

2-ui/1-document/11-coordinates/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Additionally, there are derived properties:
3636
```online
3737
For instance click this button to see its window coordinates:
3838
39-
<p><input id="brTest" type="button" value="Get coordinates using button.getBoundingClientRect() for this button" onclick='showRect(this)'/></p>
39+
<p><input id="brTest" type="button" style="max-width: 90vw;" value="Get coordinates using button.getBoundingClientRect() for this button" onclick='showRect(this)'/></p>
4040
4141
<script>
4242
function showRect(elem) {

2-ui/3-event-details/6-pointer-events/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Some pointer devices measure contact area and pressure, e.g. for a finger on the
6969
- `height` - the height of the area where the pointer touches the device. Where unsupported, it's always `1`.
7070
- `pressure` - the pressure of the pointer tip, in range from 0 to 1. For devices that don't support pressure must be either `0.5` (pressed) or `0`.
7171
- `tangentialPressure` - the normalized tangential pressure.
72-
- `tiltX`, `tiltY`, `twist` - pen-specific properties that describe how the pen is positioned relative the surface.
72+
- `tiltX`, `tiltY`, `twist` - pen-specific properties that describe how the pen is positioned relative to the surface.
7373
7474
These properties aren't supported by most devices, so they are rarely used. You can find the details about them in the [specification](https://w3c.github.io/pointerevents/#pointerevent-interface) if needed.
7575

5-network/10-long-polling/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The flow:
2929
3. When a message appears - the server responds to the request with it.
3030
4. The browser makes a new request immediately.
3131

32-
The situation when the browser sent a request and has a pending connection with the server, is standard for this method. Only when a message is delivered, the connection is reestablished.
32+
This situation, where the browser has sent a request and keeps a pending connection with the server, is standard for this method. Only when a message is delivered, the connection is closed and reestablished.
3333

3434
![](long-polling.svg)
3535

0 commit comments

Comments
 (0)