Skip to content

Commit

Permalink
Merge branch 'main' into aligndatatypes
Browse files Browse the repository at this point in the history
  • Loading branch information
estelle authored Jan 15, 2025
2 parents a42131f + 3344de5 commit 72898eb
Show file tree
Hide file tree
Showing 34 changed files with 719 additions and 572 deletions.
2 changes: 2 additions & 0 deletions files/en-us/_redirects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12791,6 +12791,7 @@
/en-US/docs/Web/JavaScript/Guide/Inheritance_Revisited /en-US/docs/Web/JavaScript/Inheritance_and_the_prototype_chain
/en-US/docs/Web/JavaScript/Guide/Inheritance_and_the_prototype_chain /en-US/docs/Web/JavaScript/Inheritance_and_the_prototype_chain
/en-US/docs/Web/JavaScript/Guide/JavaScript_Overview /en-US/docs/Web/JavaScript/Guide/Introduction
/en-US/docs/Web/JavaScript/Guide/Numbers_and_dates /en-US/docs/Web/JavaScript/Guide/Numbers_and_strings
/en-US/docs/Web/JavaScript/Guide/Obsolete_Pages /en-US/docs/Web/JavaScript/Guide
/en-US/docs/Web/JavaScript/Guide/Obsolete_Pages/Block_Statement /en-US/docs/Web/JavaScript/Guide/Control_flow_and_error_handling
/en-US/docs/Web/JavaScript/Guide/Obsolete_Pages/Calling_Functions /en-US/docs/Web/JavaScript/Guide/Functions
Expand Down Expand Up @@ -12876,6 +12877,7 @@
/en-US/docs/Web/JavaScript/Guide/Regular_expressions/Unicode_property_escapes /en-US/docs/Web/JavaScript/Reference/Regular_expressions/Unicode_character_class_escape
/en-US/docs/Web/JavaScript/Guide/Sameness /en-US/docs/Web/JavaScript/Equality_comparisons_and_sameness
/en-US/docs/Web/JavaScript/Guide/Statements /en-US/docs/Web/JavaScript/Guide/Control_flow_and_error_handling
/en-US/docs/Web/JavaScript/Guide/Text_formatting /en-US/docs/Web/JavaScript/Guide/Numbers_and_strings
/en-US/docs/Web/JavaScript/Guide/The_Iterator_protocol /en-US/docs/Web/JavaScript/Reference/Iteration_protocols
/en-US/docs/Web/JavaScript/Guide/The_legacy_Iterator_protocol /en-US/docs/Web/JavaScript/Reference/Deprecated_and_obsolete_features
/en-US/docs/Web/JavaScript/Guide/Using_native_JSON /en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON
Expand Down
27 changes: 1 addition & 26 deletions files/en-us/_wikihistory.json
Original file line number Diff line number Diff line change
Expand Up @@ -102176,7 +102176,7 @@
"douglasnaphas"
]
},
"Web/JavaScript/Guide/Numbers_and_dates": {
"Web/JavaScript/Guide/Numbers_and_strings": {
"modified": "2020-11-14T07:27:01.088Z",
"contributors": [
"mfuji09",
Expand Down Expand Up @@ -102422,31 +102422,6 @@
"jpmedley"
]
},
"Web/JavaScript/Guide/Text_formatting": {
"modified": "2020-05-25T10:48:56.137Z",
"contributors": [
"fscholz",
"wbamberg",
"bma",
"alattalatta",
"vriojtg",
"sbfraser01",
"chrisdavidmills",
"JigneshMistry",
"stephaniehobson",
"SphinxKnight",
"amir77ameri",
"ThomasEugeneBishop",
"nmve",
"kdex",
"Jeremie",
"danielinux7",
"gportioli",
"xfq",
"mahzaib",
"kscarfone"
]
},
"Web/JavaScript/Guide/Typed_arrays": {
"modified": "2020-10-15T21:04:01.905Z",
"contributors": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Regardless of the type of camera, we would always need information regarding its

- `x` and `y`: The current position of the camera. In this implementation, we are assuming that `(x,y)` points to the top left corner of visible portion of the map.
- `width` and `height`: The size of the camera's viewport.
- `maxX` and `maxY`: The limit for the camera's position — The lower limit will nearly always be (0,0), and in this case the upper limit is equal to the size of the world minus the size of the camera's viewport.
- `maxX` and `maxY`: The limit for the camera's position — The lower limit will nearly always be `(0,0)`, and in this case the upper limit is equal to the size of the world minus the size of the camera's viewport.

## Rendering the map

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You can open the index file in your favorite browser to launch the game and try

- `img`: All the images that we will use in the game.
- `src`: The JavaScript files with all the source code of the game defined inside.
- `audio:` The sound files used in the game.
- `audio`: The sound files used in the game.

## Setting up the Canvas

Expand Down
17 changes: 17 additions & 0 deletions files/en-us/glossary/guaranteed_invalid_value/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
title: Guaranteed-invalid value
slug: Glossary/guaranteed_invalid_value
page-type: glossary-definition
---

{{GlossarySidebar}}

In CSS the guaranteed-invalid value is {{CSSXref("initial")}}.

When a [custom property](/en-US/docs/Web/CSS/--*)'s value is the guaranteed-invalid value, the {{CSSXref("var")}} function cannot use it for substitution. Attempting to do so makes the declaration _invalid at computed-value time_, unless a valid fallback is specified.

## See also

- CSS {{CSSXref("initial")}}
- CSS {{CSSXref("var")}}
- [CSS Custom Properties for Cascading Variables Module Level 1 Specification](https://www.w3.org/TR/css-variables-1/#guaranteed-invalid)
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ In the next article, we'll explore text and how JavaScript allows us to manipula

## See also

- [Numbers and dates](/en-US/docs/Web/JavaScript/Guide/Numbers_and_dates)
- [Numbers and strings](/en-US/docs/Web/JavaScript/Guide/Numbers_and_strings)
- [Expressions and operators](/en-US/docs/Web/JavaScript/Guide/Expressions_and_operators)

{{PreviousMenuNext("Learn_web_development/Core/Scripting/Variables", "Learn_web_development/Core/Scripting/Strings", "Learn_web_development/Core/Scripting")}}
2 changes: 1 addition & 1 deletion files/en-us/web/api/pushsubscription/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const subscriptionObject = {
// Stringify the object an post to the app server
fetch(`https://example.com/push/`, {
method: "post",
body: JSON.stringify(pushSubscription);
body: JSON.stringify(subscriptionObject);
});
```

Expand Down
4 changes: 3 additions & 1 deletion files/en-us/web/api/selection/anchoroffset/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ browser-compat: api.Selection.anchorOffset

The **`Selection.anchorOffset`** read-only property returns the
number of characters that the selection's anchor is offset within the
{{domxref("Selection.anchorNode")}}.
{{domxref("Selection.anchorNode")}} if said node is of type {{domxref("Text")}}, {{domxref("CDATASection")}} or {{domxref("Comment")}}.

In the case of {{domxref("Selection.anchorNode")}} being another type of node, **`Selection.anchorOffset`** returns the number of {{domxref("Node.childNodes")}} the selection's focus is offset within the {{domxref("Selection.anchorNode")}}.

This number is zero-based. If the selection begins with the first character in the
{{domxref("Selection.anchorNode")}}, `0` is returned.
Expand Down
4 changes: 3 additions & 1 deletion files/en-us/web/api/selection/focusoffset/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ browser-compat: api.Selection.focusOffset

The **`Selection.focusOffset`** read-only property returns the
number of characters that the selection's focus is offset within the
{{domxref("Selection.focusNode")}}.
{{domxref("Selection.focusNode")}} if said node is of type {{domxref("Text")}}, {{domxref("CDATASection")}} or {{domxref("Comment")}}.

In the case of {{domxref("Selection.focusNode")}} being another type of node, **`Selection.focusOffset`** returns the number of {{domxref("Node.childNodes")}} the selection's focus is offset within the {{domxref("Selection.focusNode")}}.

This number is zero-based. If the selection ends with the first character in the
{{domxref("Selection.focusNode")}}, `0` is returned.
Expand Down
2 changes: 1 addition & 1 deletion files/en-us/web/css/align-self/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ align-self: unset;
- In absolutely-positioned layouts, the keyword behaves like `start` on _replaced_ absolutely-positioned boxes, and as `stretch` on _all other_ absolutely-positioned boxes.
- In static position of absolutely-positioned layouts, the keyword behaves as `stretch`.
- For flex items, the keyword behaves as `stretch`.
- For grid items, this keyword leads to a behavior similar to the one of `stretch`, except for boxes with an {{glossary("aspect ratio")}} or an intrinsic sizes where it behaves like `start`.
- For grid items, this keyword leads to a behavior similar to the one of `stretch`, except for boxes with an {{glossary("aspect ratio")}} or an intrinsic size where it behaves like `start`.
- The property doesn't apply to block-level boxes, and to table cells.

- `self-start`
Expand Down
Loading

0 comments on commit 72898eb

Please sign in to comment.