Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into remove-alert-webapi
Browse files Browse the repository at this point in the history
* upstream/main: (87 commits)
  Update formdata and touchstart macros (mdn#7713)
  Corrected sentence in Streams API overview (mdn#7712)
  Fix broken link (mdn#7711)
  Replace SVGMatrix with DOMMatrix (mdn#7710)
  Removed example covered by other examples (mdn#7706)
  Remove last link to NameList (mdn#7708)
  Delete DOMObject (mdn#7701)
  Remove <dl> list for return value of DOMException() (mdn#7699)
  Fix broken links in Glossary (mdn#7692)
  Fix broken link to NSS/FAQ (mdn#7709)
  Update DOM intro (DOM is no more different in each browsers) (mdn#7705)
  Update Touch() contructor syntax (mdn#7702)
  Replace usage of alert() in File.name(mdn#7703)
  Replace usage of alert() in KeyboardEvent.metaKey(mdn#7704)
  Replace usage of alert() in DOMException() (mdn#7698)
  Remove unnecessary <code> tag (mdn#7697)
  Fix mixin example in Object.create() article (mdn#7631)
  Replace usage of alert() in EventListener (mdn#7690)
  Fix link from Element to Document.querySelectorAll (mdn#7688)
  Replace usage of alert() in Window.find() (mdn#7686)
  ...
  • Loading branch information
wbamberg committed Aug 8, 2021
2 parents 4c3ea73 + c21e639 commit 39001c6
Show file tree
Hide file tree
Showing 326 changed files with 2,723 additions and 1,843 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: "12"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-check_redirects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: "12"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: "12"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: "12"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2

- name: Setup Node.js environment
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: "12"

Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ with us first!
You can [chat with us](https://chat.mozilla.org/#/room/#mdn:mozilla.org) or
[file an issue](https://github.com/mdn/content/issues).

You may be asked to further edit files in your pull request.
To open a file for editing, select the *Files changed* tab on the PR,
scroll down to the section for the file you want to edit, and then select
the "three dots" icon (at the top right of the section).
Choose **Edit file** from the popup menu to start editing the file.
After editing, your changes will result in a new commit.

### More substantial changes

If you need to do some work that requires changes to more than one file, like
Expand Down
4 changes: 2 additions & 2 deletions files/en-us/_redirects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,6 @@
/en-US/docs/DOM/DOMImplementation.createDocument /en-US/docs/Web/API/DOMImplementation/createDocument
/en-US/docs/DOM/DOMImplementation.createDocumentType /en-US/docs/Web/API/DOMImplementation/createDocumentType
/en-US/docs/DOM/DOMImplementation.createHTMLDocument /en-US/docs/Web/API/DOMImplementation/createHTMLDocument
/en-US/docs/DOM/DOMObject /en-US/docs/Web/API/DOMObject
/en-US/docs/DOM/DOMParser /en-US/docs/Web/API/DOMParser
/en-US/docs/DOM/DOMString /en-US/docs/Web/API/DOMString
/en-US/docs/DOM/DOMStringList /en-US/docs/Web/API/DOMStringList
Expand Down Expand Up @@ -2791,7 +2790,6 @@
/en-US/docs/Document_Object_Model_(DOM)/DOMImplementation.createDocument /en-US/docs/Web/API/DOMImplementation/createDocument
/en-US/docs/Document_Object_Model_(DOM)/DOMImplementation.createDocumentType /en-US/docs/Web/API/DOMImplementation/createDocumentType
/en-US/docs/Document_Object_Model_(DOM)/DOMImplementation.createHTMLDocument /en-US/docs/Web/API/DOMImplementation/createHTMLDocument
/en-US/docs/Document_Object_Model_(DOM)/DOMObject /en-US/docs/Web/API/DOMObject
/en-US/docs/Document_Object_Model_(DOM)/DOMString /en-US/docs/Web/API/DOMString
/en-US/docs/Document_Object_Model_(DOM)/DOMStringList /en-US/docs/Web/API/DOMStringList
/en-US/docs/Document_Object_Model_(DOM)/DOMStringMap /en-US/docs/Web/API/DOMStringMap
Expand Down Expand Up @@ -8917,6 +8915,7 @@
/en-US/docs/Web/API/Window/onvrdisplayconnected /en-US/docs/Web/API/Window/onvrdisplayconnect
/en-US/docs/Web/API/Window/onvrdisplaydisconnected /en-US/docs/Web/API/Window/onvrdisplaydisconnect
/en-US/docs/Web/API/Window/removeEventListener /en-US/docs/Web/API/EventTarget/removeEventListener
/en-US/docs/Web/API/Window/resolveLocalFileSystemURL /en-US/docs/Web/API/LocalFileSystem#resolvelocalfilesystemurl()
/en-US/docs/Web/API/Window/restore /en-US/docs/Web/API/Window/moveTo
/en-US/docs/Web/API/Window/setInterval /en-US/docs/Web/API/WindowOrWorkerGlobalScope/setInterval
/en-US/docs/Web/API/Window/setTimeout /en-US/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout
Expand Down Expand Up @@ -8982,6 +8981,7 @@
/en-US/docs/Web/API/WorkerGlobalScope/fetch /en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch
/en-US/docs/Web/API/WorkerGlobalScope/indexedDB /en-US/docs/Web/API/WindowOrWorkerGlobalScope/indexedDB
/en-US/docs/Web/API/WorkerGlobalScope/onclose /en-US/docs/Web/API/DedicatedWorkerGlobalScope/close
/en-US/docs/Web/API/WorkerGlobalScope/requestFileSystemSync /en-US/docs/Web/API/LocalFileSystemSync/requestFileSystemSync
/en-US/docs/Web/API/WorkerGlobalScope/setInterval /en-US/docs/Web/API/WindowOrWorkerGlobalScope/setInterval
/en-US/docs/Web/API/WorkerGlobalScope/setTimeout /en-US/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout
/en-US/docs/Web/API/WorkerLocation.hash /en-US/docs/Web/API/WorkerLocation/hash
Expand Down
11 changes: 0 additions & 11 deletions files/en-us/_wikihistory.json
Original file line number Diff line number Diff line change
Expand Up @@ -35116,17 +35116,6 @@
"gingerchris"
]
},
"Web/API/DOMObject": {
"modified": "2019-03-23T23:59:07.618Z",
"contributors": [
"Sheppy",
"Sebastianz",
"teoli",
"kscarfone",
"ethertank",
"Brettz9"
]
},
"Web/API/DOMParser": {
"modified": "2020-10-25T22:15:37.690Z",
"contributors": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h2 id="Mobile_audio_caveats">Mobile audio caveats</h2>

<h3 id="Autoplay">Autoplay</h3>

<p>Browser autoplay policy now affects desktop <em>and</em> mobile browsers. There is further information about it <a href="https://developers.google.com/web/updates/2017/09/autoplay-policy-changes">here from the Google Developers site</a>.</p>
<p>Browser autoplay policy now affects desktop <em>and</em> mobile browsers. There is further information about it <a href="https://developer.chrome.com/blog/autoplay/">here from the Google Developers site</a>.</p>

<p>It is worth noting that autoplay with sound is allowed if:</p>

Expand Down
1 change: 0 additions & 1 deletion files/en-us/glossary/certified/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ <h2 id="Learn_more">Learn more</h2>
<h3 id="General_knowledge">General knowledge</h3>

<ul>
<li><a href="/en-US/docs/Web/Security/Information_Security_Basics">Information security tutorial</a></li>
<li>{{Interwiki("wikipedia", "Professional_certification_(computer_technology)#Information_systems_security", "Certification")}} on Wikipedia</li>
</ul>
4 changes: 2 additions & 2 deletions files/en-us/glossary/css/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
- CodingScripting
- Glossary
- Web
- 'l10n:priority'
- l10n:priority
---
<p><span class="seoSummary"><strong>CSS</strong> (Cascading Style Sheets) is a declarative language that controls how webpages look in the {{glossary("browser")}}.</span> The browser applies CSS style declarations to selected elements to display them properly. A style declaration contains the properties and their values, which determine how a webpage looks.</p>

<p>CSS is one of the three core Web technologies, along with {{Glossary("HTML")}} and {{Glossary("JavaScript")}}. CSS usually styles {{Glossary("Element","HTML elements")}}, but can be also used with other markup languages like {{Glossary("SVG")}} or {{Glossary("XML")}}.</p>

<p>A CSS rule is a set of {{Glossary("CSS Property","properties")}} associated with a {{Glossary("CSS selector", "selector")}}. Here is an example that makes every HTML paragraph yellow against a black background:</p>
<p>A CSS rule is a set of {{Glossary("property/CSS","properties")}} associated with a {{Glossary("CSS selector", "selector")}}. Here is an example that makes every HTML paragraph yellow against a black background:</p>

<pre class="brush: css">/* The selector "p" indicates that all paragraphs in the document will be affected by that rule */
p {
Expand Down
2 changes: 1 addition & 1 deletion files/en-us/glossary/developer_tools/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- Developer Tools
- Glossary
---
<p>Developer tools (or "development tools" or short "DevTools") are programs that allow a developer to create, test and {{Glossary("debug")}} software.</p>
<p>Developer tools (or "development tools" or short "DevTools") are programs that allow a developer to create, test and debug software.</p>

<p>Current browsers provide integrated developer tools, which allow to inspect a website. They let users inspect and debug the page's {{Glossary("HTML")}}, {{Glossary("CSS")}}, and {{Glossary("JavaScript")}}, allow to inspect the network traffic it causes, make it possible to measure it's performance, and much more.</p>

Expand Down
2 changes: 1 addition & 1 deletion files/en-us/glossary/domain_sharding/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<h2 id="See_also">See also</h2>

<ul>
<li><a href="/en-US/docs/Archive/Security/SSL_and_TLS">Transport Layer Security (TLS)</a></li>
<li>{{Glossary("TLS")}}</li>
<li><a href="/en-US/docs/Glossary/DNS">DNS</a></li>
<li><a href="/en-US/docs/Glossary/HTTP_2">HTTP/2</a></li>
</ul>
2 changes: 1 addition & 1 deletion files/en-us/glossary/progressive_web_apps/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ <h2 id="Learn_more">Learn more</h2>

<ul>
<li>The <a href="/en-US/docs/Web/Progressive_web_apps">App Center</a> on MDN</li>
<li><a href="https://developers.google.com/web/progressive-web-apps">Progressive web apps</a> on Google Developers</li>
<li><a href="https://web.dev/progressive-web-apps/">Progressive web apps</a> on Google Developers</li>
</ul>
1 change: 0 additions & 1 deletion files/en-us/glossary/rendering_engine/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ <h3 id="General_knowledge">General knowledge</h3>
<h3 id="Technical_reference">Technical reference</h3>

<ul>
<li><a href="/en-US/docs/Mozilla/Gecko">Gecko documentation</a></li>
<li><a href="https://medium.com/@ramsunvtech/behind-browser-basics-part-1-b733e9f3c0e6">Venkatraman.R - Behind Browsers (Part 1, Basics) </a></li>
</ul>
2 changes: 1 addition & 1 deletion files/en-us/glossary/time_to_interactive/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ <h2 id="See_also">See also</h2>
<ul>
<li><a href="https://github.com/WICG/time-to-interactive">Definition of TTI</a> from Web Incubator Community Group</li>
<li><a href="https://building.calibreapp.com/time-to-interactive-focusing-on-the-human-centric-metrics-22eb7e64dd23">Time to Interactive — focusing on human-centric metrics</a> by Radimir Bitsov</li>
<li><a href="https://developers.google.com/web/fundamentals/performance/user-centric-performance-metrics#tracking_tti">Tracking TTI</a></li>
<li><a href="https://web.dev/user-centric-performance-metrics/#tracking_tti">Tracking TTI</a></li>
</ul>
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ <h2 id="The_problem_with_testing_local_files">The problem with testing local fil

<h2 id="Running_a_simple_local_HTTP_server">Running a simple local HTTP server</h2>

<p>To get around the problem of async requests, we need to test such examples by running them through a local web server. One of the easiest ways to do this for our purposes is to use Python's <code>SimpleHTTPServer</code> (or <code>http.server</code>, depending on the version of Python installed.)</p>
<p>To get around the problem of async requests, we need to test such examples by running them through a local web server. One of the easiest ways to do this for our purposes is to use Python's <code>http.server</code> module.

<div class="notecard note">
<p><strong>Note:</strong> Older versions of Python (up to version 2.7) provided a similar module named <code>SimpleHTTPServer</code>. If you are using Python 2.x, you can follow this guide by replacing all uses of <code>http.server</code> with <code>SimpleHTTPServer</code>. However, we recommend you use the latest version of Python.</p>
</div>

<p>To do this:</p>

Expand All @@ -59,18 +63,20 @@ <h2 id="Running_a_simple_local_HTTP_server">Running a simple local HTTP server</
<ul>
<li>Go to <a href="https://www.python.org/">python.org</a></li>
<li>Under the Download section, click the link for Python "3.xxx".</li>
<li>At the bottom of the page, choose the <em>Windows x86 executable installer</em> and download it.</li>
<li>At the bottom of the page, click the <em>Windows Installer</em> link to download the installer file.</li>
<li>When it has downloaded, run it.</li>
<li>On the first installer page, make sure you check the "Add Python 3.xxx to PATH" checkbox.</li>
<li>Click <em>Install</em>, then click <em>Close</em> when the installation has finished.</li>
</ul>
</li>
<li>
<p>Open your command prompt (Windows)/ terminal (macOS/ Linux). To check Python is installed, enter the following command:</p>
<p>Open your command prompt (Windows) / terminal (macOS/ Linux). To check if Python is installed, enter the following command:</p>

<pre class="brush: bash">python -V
# Or you might have the py command available,
# in which case try py -V
# If the above fails, try:
python3 -V
# Or, if the &quot;py&quot; command is available, try:
py -V
</pre>
</li>
<li>
Expand All @@ -85,8 +91,8 @@ <h2 id="Running_a_simple_local_HTTP_server">Running a simple local HTTP server</
<p>Enter the command to start up the server in that directory:</p>

<pre class="brush: bash"># If Python version returned above is 3.X
# On Windows, try &quot;python -m http.server&quot; or &quot;py -3 -m http.server&quot;
python3 -m http.server
# On windows try &quot;python&quot; instead of &quot;python3&quot;, or &quot;py -3&quot;
# If Python version returned above is 2.X
python -m SimpleHTTPServer</pre>
</li>
Expand All @@ -101,10 +107,10 @@ <h2 id="Running_a_simple_local_HTTP_server">Running a simple local HTTP server</

<h2 id="Running_server-side_languages_locally">Running server-side languages locally</h2>

<p>Python's <code>SimpleHTTPServer (python 2.0) http.server (python 3.0)</code> module is useful, but it doesn't know how to run code written in languages such as Python, PHP or JavaScript. To handle that you'll need something more — exactly what you'll need depends on the server-side language you are trying to run. Here are a few examples:</p>
<p>Python's <code>http.server</code> (or <code>SimpleHTTPServer</code> for Python 2) module is useful, but it is merely a <em>static</em> file server; it doesn't know how to run code written in languages such as Python, PHP or JavaScript. To handle them, you'll need something more — exactly what you'll need depends on the server-side language you are trying to run. Here are a few examples:</p>

<ul>
<li>To run Python server-side code, you'll need to use a Python web framework. You can find out how to use the Django framework by reading <a href="/en-US/docs/Learn/Server-side/Django">Django Web Framework (Python)</a>. <a href="http://flask.pocoo.org/">Flask</a> is also a good (slightly less heavyweight) alternative to Django. To run this you'll need to <a href="/en-US/docs/Learn/Server-side/Django/development_environment#installing_python_3">install Python/PIP</a>, then install Flask using <code>pip3 install flask</code>. At this point you should be able to run the Python Flask examples using for example <code>python3 python-example.py</code>, then navigating to <code>localhost:5000</code> in your browser. <a href="https://trypyramid.com">Pyramid</a> is another popular Python web framework that supports both small quick applications as well as large custom architectures.</li>
<li>To run Python server-side code, you'll need to use a Python web framework. There are many popular Python web frameworks, such as Django (a <a href="/en-US/docs/Learn/Server-side/Django">guide</a> is available), <a href="https://flask.palletsprojects.com/">Flask</a>, and <a href="https://trypyramid.com">Pyramid</a>.</li>
<li>To run Node.js (JavaScript) server-side code, you'll need to use raw node or a framework built on top of it. Express is a good choice — see <a href="/en-US/docs/Learn/Server-side/Express_Nodejs">Express Web Framework (Node.js/JavaScript)</a>.</li>
<li>
<p>To run PHP server-side code, launch <a href="https://php.net/manual/en/features.commandline.webserver.php">PHP's built-in development server</a>:</p>
Expand Down
Loading

0 comments on commit 39001c6

Please sign in to comment.