You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This fixes typos in docs, `settings.js` (because the comments here are
copied into `settings_reference.rst`), and header strings in
`update_settings_docs.py`.
Split out of #26014.
Copy file name to clipboardExpand all lines: site/source/docs/api_reference/Filesystem-API.rst
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -171,7 +171,7 @@ The device node acts as an interface between the device and the file system. Any
171
171
Setting up standard I/O devices
172
172
===============================
173
173
174
-
Emscripten standard I/O works by going though the virtual ``/dev/stdin``, ``/dev/stdout`` and ``/dev/stderr`` devices. You can set them up using your own I/O functions by calling :js:func:`FS.init`.
174
+
Emscripten standard I/O works by going through the virtual ``/dev/stdin``, ``/dev/stdout`` and ``/dev/stderr`` devices. You can set them up using your own I/O functions by calling :js:func:`FS.init`.
Copy file name to clipboardExpand all lines: site/source/docs/api_reference/html5.h.rst
+12-12Lines changed: 12 additions & 12 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -338,7 +338,7 @@ Struct
338
338
339
339
A system and implementation dependent numeric code identifying the unmodified value of the pressed key; this is usually the same as ``keyCode``.
340
340
341
-
.. warning:: This attribute is deprecated, you should use the field ``key`` instead, if available. Note thought that while this field is deprecated, the cross-browser support for ``which`` may be better than for the other fields, so experimentation is recommended. Read issue https://github.com/emscripten-core/emscripten/issues/2817 for more information.
341
+
.. warning:: This attribute is deprecated, you should use the field ``key`` instead, if available. Note though that while this field is deprecated, the cross-browser support for ``which`` may be better than for the other fields, so experimentation is recommended. Read issue https://github.com/emscripten-core/emscripten/issues/2817 for more information.
342
342
343
343
344
344
Callback functions
@@ -458,7 +458,7 @@ Struct
458
458
.. c:member::int canvasX
459
459
int canvasY
460
460
461
-
These fields give the mouse coordinates mapped to the Emscripten canvas client area (Emscripten-specific extension; coordinates are rounded down the nearest integer).
461
+
These fields give the mouse coordinates mapped to the Emscripten canvas client area (Emscripten-specific extension; coordinates are rounded down to the nearest integer).
462
462
463
463
464
464
.. c:member::int padding
@@ -515,7 +515,7 @@ Functions
515
515
516
516
Returns the most recently received mouse event state.
517
517
518
-
Note that for this function call to succeed, :c:func:`emscripten_set_xxx_callback <emscripten_set_click_callback>` must have first been called with one of the mouse event types and a non-zero callback function pointer to enable the Mouse state capture.
518
+
Note that for this function call to succeed, :c:func:`emscripten_set_xxx_callback <emscripten_set_click_callback>` must have first been called with one of the mouse event types and a non-zero callback function pointer to enable the mouse state capture.
519
519
520
520
:param EmscriptenMouseEvent* mouseState: The most recently received mouse event state.
521
521
:returns::c:data:`EMSCRIPTEN_RESULT_SUCCESS`, or one of the other result values.
@@ -561,7 +561,7 @@ Struct
561
561
double deltaY
562
562
double deltaZ
563
563
564
-
Movement of the wheel on each of the axis. Note that these values may be fractional, so you should avoid simply casting them to integer, or it might result
564
+
Movement of the wheel on each of the axes. Note that these values may be fractional, so you should avoid simply casting them to integer, or it might result
565
565
in scroll values of 0. The positive Y scroll direction is when scrolling the page downwards (page CSS pixel +Y direction), which corresponds to scrolling
566
566
the mouse wheel downwards (away from the screen) on Windows, Linux, and also on macOS when the 'natural scroll' option is disabled.
567
567
@@ -794,7 +794,7 @@ Struct
794
794
795
795
The `orientation <https://developer.mozilla.org/en-US/Apps/Build/gather_and_modify_data/responding_to_device_orientation_changes#Device_Orientation_API>`_ of the device in terms of the transformation from a coordinate frame fixed on the Earth to a coordinate frame fixed in the device.
796
796
797
-
The image (source: `dev.opera.com <http://dev.opera.com/articles/view/w3c-device-orientation-api/>`_) and definitions below illustrate the co-ordinate frame:
797
+
The image (source: `dev.opera.com <http://dev.opera.com/articles/view/w3c-device-orientation-api/>`_) and definitions below illustrate the coordinate frame:
798
798
799
799
- :c:type:`~EmscriptenDeviceOrientationEvent.alpha`: the rotation of the device around the Z axis.
800
800
- :c:type:`~EmscriptenDeviceOrientationEvent.beta`: the rotation of the device around the X axis.
@@ -1767,7 +1767,7 @@ Functions
1767
1767
.. note::
1768
1768
1769
1769
Gamepad API uses an array of gamepad state objects to return the state of
1770
-
each device. The devices are identified via the index they are present in in
1770
+
each device. The devices are identified via the index they are present in
1771
1771
this array. Because of that, if one first connects gamepad A, then gamepad
1772
1772
B, and then disconnects gamepad A, the gamepad B shall not take the place of
1773
1773
gamepad A, so in this scenario, this function will still keep returning two
The event structure passed in the `batterymanager <http://www.w3.org/TR/battery-status/#batterymanager-interface>`_ events: ``chargingchange`` and ``levelchange``.
1814
+
The event structure passed in the `BatteryManager <http://www.w3.org/TR/battery-status/#batterymanager-interface>`_ events: ``chargingchange`` and ``levelchange``.
1815
1815
1816
1816
1817
1817
.. c:member:: double chargingTime
@@ -1836,14 +1836,14 @@ Callback functions
1836
1836
1837
1837
.. c:type:: em_battery_callback_func
1838
1838
1839
-
Function pointer for the :c:func:`batterymanager event callback functions <emscripten_set_batterychargingchange_callback>`, defined as:
1839
+
Function pointer for the :c:func:`BatteryManager event callback functions <emscripten_set_batterychargingchange_callback>`, defined as:
Registers a callback function for receiving the `batterymanager<http://www.w3.org/TR/battery-status/#batterymanager-interface>`_ events: ``chargingchange`` and ``levelchange``.
1860
+
Registers a callback function for receiving the `BatteryManager<http://www.w3.org/TR/battery-status/#batterymanager-interface>`_ events: ``chargingchange`` and ``levelchange``.
Copy file name to clipboardExpand all lines: site/source/docs/api_reference/preamble.js.rst
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -81,7 +81,7 @@ Calling compiled C functions from JavaScript
81
81
82
82
Returns a native JavaScript wrapper for a C function.
83
83
84
-
This is similar to :js:func:`ccall`, but returns a JavaScript function that can be reused as many time as needed. The C function can be defined in a C file, or be a C-compatible C++ function defined using ``extern "C"`` (to prevent name mangling).
84
+
This is similar to :js:func:`ccall`, but returns a JavaScript function that can be reused as many times as needed. The C function can be defined in a C file, or be a C-compatible C++ function defined using ``extern "C"`` (to prevent name mangling).
Copy file name to clipboardExpand all lines: site/source/docs/api_reference/wasm_workers.rst
+1-3Lines changed: 1 addition & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -117,8 +117,6 @@ If you need to synchronously wait for the posted function to finish from within
117
117
the ``emscripten_wasm_worker_*()`` thread synchronization functions to sleep the calling thread until
118
118
the callee has finished the operation.
119
119
120
-
Note that Wasm Workers cannot
121
-
122
120
Pthreads have cancellation points
123
121
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
124
122
@@ -371,7 +369,7 @@ Both APIs allow one to spawn Web Workers from the main thread, though the semant
371
369
372
370
With the Worker API, the user will be able to spawn a Web Worker from a custom URL. This URL can point to a completely separate JS file that was not compiled with Emscripten, to load up Workers from arbitrary URLs. With Wasm Workers, a custom URL is not specified: Wasm Workers will always spawn a Web Worker that computes in the same WebAssembly+JavaScript context as the main program.
373
371
374
-
The Worker API does not integrate with SharedArrayBuffer, so interaction with the loaded Worker will always be asynchronous. Wasm Workers howerer is built on top of SharedArrayBuffer, and each Wasm Worker shares and computes in the same WebAssembly Memory address space of the main thread.
372
+
The Worker API does not integrate with SharedArrayBuffer, so interaction with the loaded Worker will always be asynchronous. Wasm Workers however is built on top of SharedArrayBuffer, and each Wasm Worker shares and computes in the same WebAssembly Memory address space of the main thread.
375
373
376
374
Both the Worker API and Wasm Workers API provide the user with ability to postMessage() function calls to the Worker. In Worker API, this message posting is restricted to need to originate/initiate from the main thread towards the Worker (using the API ``emscripten_call_worker()`` and ``emscripten_worker_respond()`` in ``<emscripten.h>``). With Wasm Workers however one can also postMessage() function calls to their parent (owning) thread.
0 commit comments