Skip to content

Commit 0923553

Browse files
committed
Merge remote-tracking branch 'upstream/main' into ellipse-fix
2 parents 75fac2e + 33883e5 commit 0923553

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6404,6 +6404,15 @@
64046404
"contributions": [
64056405
"doc"
64066406
]
6407+
},
6408+
{
6409+
"login": "Dhanush111",
6410+
"name": "dhanush",
6411+
"avatar_url": "https://avatars.githubusercontent.com/u/51503598?v=4",
6412+
"profile": "https://github.com/Dhanush111",
6413+
"contributions": [
6414+
"doc"
6415+
]
64076416
}
64086417
],
64096418
"repoType": "github",

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,6 +1073,7 @@ We recognize all types of contributions. This project follows the [all-contribut
10731073
<td align="center" valign="top" width="16.66%"><a href="https://www.linkedin.com/in/ashish1729/"><img src="https://avatars.githubusercontent.com/u/10610651?v=4?s=120" width="120px;" alt="ashish singh"/><br /><sub><b>ashish singh</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=ashish1729" title="Code">💻</a></td>
10741074
<td align="center" valign="top" width="16.66%"><a href="http://alexhennings.dev"><img src="https://avatars.githubusercontent.com/u/31355456?v=4?s=120" width="120px;" alt="blackboxlogic"/><br /><sub><b>blackboxlogic</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=blackboxlogic" title="Documentation">📖</a></td>
10751075
<td align="center" valign="top" width="16.66%"><a href="https://github.com/zs-5"><img src="https://avatars.githubusercontent.com/u/177980470?v=4?s=120" width="120px;" alt="ℤ"/><br /><sub><b>ℤ</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=zs-5" title="Documentation">📖</a></td>
1076+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Dhanush111"><img src="https://avatars.githubusercontent.com/u/51503598?v=4?s=120" width="120px;" alt="dhanush"/><br /><sub><b>dhanush</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=Dhanush111" title="Documentation">📖</a></td>
10761077
</tr>
10771078
</tbody>
10781079
</table>

src/accessibility/describe.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const labelTableElId = '_lte_'; //Label Table Element
2828
* visible to screen readers. This is the default mode.
2929
*
3030
* Read
31-
* <a href="/learn/accessible-labels.html">Writing accessible canvas descriptions</a>
31+
* <a href="https://p5js.org/tutorials/writing-accessible-canvas-descriptions/">Writing accessible canvas descriptions</a>
3232
* to learn more about making sketches accessible.
3333
*
3434
* @method describe
@@ -179,7 +179,7 @@ p5.prototype.describe = function(text, display) {
179179
* mode.
180180
*
181181
* Read
182-
* <a href="/learn/accessible-labels.html">Writing accessible canvas descriptions</a>
182+
* <a href="https://p5js.org/tutorials/writing-accessible-canvas-descriptions/">Writing accessible canvas descriptions</a>
183183
* to learn more about making sketches accessible.
184184
*
185185
* @method describeElement

src/accessibility/outputs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import p5 from '../core/main';
3434
* mode.
3535
*
3636
* Read
37-
* <a href="/learn/accessible-labels.html">Writing accessible canvas descriptions</a>
37+
* <a href="https://p5js.org/tutorials/writing-accessible-canvas-descriptions/">Writing accessible canvas descriptions</a>
3838
* to learn more about making sketches accessible.
3939
*
4040
* @method textOutput
@@ -169,7 +169,7 @@ p5.prototype.textOutput = function(display) {
169169
* mode.
170170
*
171171
* Read
172-
* <a href="/learn/accessible-labels.html">Writing accessible canvas descriptions</a>
172+
* <a href="https://p5js.org/tutorials/writing-accessible-canvas-descriptions/">Writing accessible canvas descriptions</a>
173173
* to learn more about making sketches accessible.
174174
*
175175
* @method gridOutput

src/color/setting.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ p5.prototype.colorMode = function(mode, max1, max2, max3, maxA) {
10001000
* @param {Number} v1 red value if color mode is RGB or hue value if color mode is HSB.
10011001
* @param {Number} v2 green value if color mode is RGB or saturation value if color mode is HSB.
10021002
* @param {Number} v3 blue value if color mode is RGB or brightness value if color mode is HSB.
1003-
* @param {Number} [alpha]
1003+
* @param {Number} [alpha] optional alpha value, controls transparency (0 - transparent, 255 - opaque).
10041004
* @chainable
10051005
* @example
10061006
* <div>

src/dom/dom.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,18 +1442,18 @@ p5.prototype.createSelect = function(...args) {
14421442
*
14431443
* The parameter is optional. If a string is passed, as in
14441444
* `let myRadio = createSelect('food')`, then each radio option will
1445-
* have `"food"` as its `name` parameter: `&lt;input name="food"&gt;&lt;/input&gt;`.
1445+
* have `"food"` as its `name` parameter: `&lt;input name="food"&gt;`.
14461446
* If an existing `&lt;div&gt;&lt;/div&gt;` or `&lt;span&gt;&lt;/span&gt;`
14471447
* element is passed, as in `let myRadio = createSelect(container)`, it will
14481448
* become the radio button's parent element.
14491449
*
14501450
* Radio buttons extend the <a href="#/p5.Element">p5.Element</a> class with a few
14511451
* helpful methods for managing options:
1452-
* - `myRadio.option(value, [label])` adds an option to the menu. The first paremeter, `value`, is a string that sets the option's value and label. The second parameter, `label`, is optional. If provided, it sets the label displayed for the `value`. If an option with `value` already exists, its label is changed and its value is returned.
1452+
* - `myRadio.option(value, [label])` adds an option to the menu. The first parameter, `value`, is a string that sets the option's value and label. The second parameter, `label`, is optional. If provided, it sets the label displayed for the `value`. If an option with `value` already exists, its label is changed and its value is returned.
14531453
* - `myRadio.value()` returns the currently-selected option's value.
14541454
* - `myRadio.selected()` returns the currently-selected option.
14551455
* - `myRadio.selected(value)` selects the given option and returns it as an <a href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement" target="_blank">`HTMLInputElement`</a>.
1456-
* - `myRadio.disable(shouldDisable)` enables the entire radio button if `true` is passed and disables it if `false` is passed.
1456+
* - `myRadio.disable(shouldDisable)` Disables the radio button if `true` is passed, and enables it if `false` is passed.
14571457
*
14581458
* @method createRadio
14591459
* @param {Object} [containerElement] container HTML Element, either a `&lt;div&gt;&lt;/div&gt;`

0 commit comments

Comments
 (0)