diff options
30 files changed, 92 insertions, 96 deletions
diff --git a/.github/workflows/pr-check_redirects.yml b/.github/workflows/pr-check_redirects.yml index 05f463bc57..02bd442498 100644 --- a/.github/workflows/pr-check_redirects.yml +++ b/.github/workflows/pr-check_redirects.yml @@ -26,18 +26,16 @@ jobs: with: node-version: "12" - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v2.1.4 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) + - name: Cache node_modules + uses: actions/cache@v2.1.4 + id: cached-node_modules with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- + path: | + ${{ github.workspace }}/mdn/content/node_modules + key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} - name: Install all yarn packages + if: steps.cached-node_modules.outputs.cache-hit != 'true' working-directory: ${{ github.workspace }}/mdn/content run: | yarn --frozen-lockfile diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index af6fada9aa..cc088b8604 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -1,13 +1,8 @@ -# Note that this workflow uses `get-diff-action` which is important. -# It gives us an environment variable called `GIT_DIFF` which is a string -# that is a list of file paths. -# If you want to do what this workflow does on your laptop you can simulate -# it like this: -# -# export GIT_DIFF=`git diff --name-only main... | grep 'files/' | grep '\.html$'` -# node content build --no-progressbar --files="${GIT_DIFF}" -# -# That way, you can behave on your laptop like, this action behaves here. +# This is more or less a copy of +# https://github.com/mdn/content/blob/main/.github/workflows/pr-test.yml +# but done in a way that it first checks out mdn/translated-content (or +# fork of) and _then_ checks out mdn/content which has the relevant +# CI related tooling. name: PR Test @@ -38,8 +33,8 @@ jobs: id: cached-node_modules with: path: | - {{ github.workspace }}/mdn/content/node_modules - key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-1 + ${{ github.workspace }}/mdn/content/node_modules + key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} - name: Install all yarn packages if: steps.cached-node_modules.outputs.cache-hit != 'true' diff --git a/.github/workflows/sync-translated-content.yml b/.github/workflows/sync-translated-content.yml index d05f29eb65..ab5cbd40c0 100644 --- a/.github/workflows/sync-translated-content.yml +++ b/.github/workflows/sync-translated-content.yml @@ -33,7 +33,7 @@ jobs: id: cached-node_modules with: path: | - **/node_modules + ${{ github.workspace }}/mdn/content/node_modules key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} - name: Install all yarn packages @@ -50,7 +50,7 @@ jobs: run: | yarn content sync-translated-content - - name: Commit changes + - name: Commit changes # git commit will fail if there are no changes but that's okay! continue-on-error: true run: | diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..8d04505769 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +_githistory.json @@ -130,8 +130,10 @@ The review teams for each locale are: - [@SphinxKnight](https://github.com/SphinxKnight) - Japanese (`ja`) content — the [@yari-content-ja](https://github.com/orgs/mdn/teams/yari-content-ja) team, which consists of: - - [@hmartjp](https://github.com/hmartjp) + - [@hmatrjp](https://github.com/hmatrjp) - [@potappo](https://github.com/potappo) + - [@dynamis](https://github.com/dynamis) + - [@kenji-yamasaki](https://github.com/kenji-yamasaki) - [@mfuji09](https://github.com/mfuji09) - Chinese (`zh-CN` and `zh-TW`) content — the [@yari-content-zh](https://github.com/orgs/mdn/teams/yari-content-zh) team, which consists of: diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt index 88824dfe79..61c4468834 100644 --- a/files/es/_redirects.txt +++ b/files/es/_redirects.txt @@ -1790,7 +1790,7 @@ /es/docs/Web/API/Document/abrir /es/docs/Web/API/Document/open /es/docs/Web/API/Document/async /es/docs/Web/API/XMLDocument/async /es/docs/Web/API/Document/crearAtributo /es/docs/Web/API/Document/createAttribute -/es/docs/Web/API/Document/getSelection /es/docs/Web/API/DocumentOrShadowRoot/getSelection +/es/docs/Web/API/DocumentOrShadowRoot/getSelection /es/docs/Web/API/Document/getSelection /es/docs/Web/API/DocumentOrShadowRoot/pointerLockElement /es/docs/Web/API/Document/pointerLockElement /es/docs/Web/API/DocumentOrShadowRoot/styleSheets /es/docs/Web/API/Document/styleSheets /es/docs/Web/API/Element/accessKey /es/docs/Web/API/HTMLElement/accessKey diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json index 9765fd105f..9cbfba64ba 100644 --- a/files/es/_wikihistory.json +++ b/files/es/_wikihistory.json @@ -23055,12 +23055,6 @@ "wbamberg" ] }, - "Web/API/DocumentOrShadowRoot/getSelection": { - "modified": "2019-03-23T22:54:50.239Z", - "contributors": [ - "Diferno" - ] - }, "Web/API/HTMLElement/accessKey": { "modified": "2019-03-23T22:26:12.172Z", "contributors": [ @@ -23743,5 +23737,11 @@ "teoli", "HenryGR" ] + }, + "Web/API/Document/getSelection": { + "modified": "2019-03-23T22:54:50.239Z", + "contributors": [ + "Diferno" + ] } }
\ No newline at end of file diff --git a/files/es/web/api/documentorshadowroot/getselection/index.html b/files/es/web/api/document/getselection/index.html index 21153bf09b..465c75bc53 100644 --- a/files/es/web/api/documentorshadowroot/getselection/index.html +++ b/files/es/web/api/document/getselection/index.html @@ -1,13 +1,13 @@ --- title: Document.getSelection() -slug: Web/API/DocumentOrShadowRoot/getSelection +slug: Web/API/Document/getSelection tags: - Referencia - Selección - metodo translation_of: Web/API/DocumentOrShadowRoot/getSelection translation_of_original: Web/API/Document/getSelection -original_slug: Web/API/Document/getSelection +original_slug: Web/API/DocumentOrShadowRoot/getSelection --- <p>{{APIRef("DOM")}}</p> diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt index b2979d133f..9809f553ab 100644 --- a/files/fr/_redirects.txt +++ b/files/fr/_redirects.txt @@ -3749,8 +3749,8 @@ /fr/docs/Web/API/Document/defaultView/storage_event /fr/docs/Web/API/Window/storage_event /fr/docs/Web/API/Document/domConfig /fr/docs/Web/API/Document /fr/docs/Web/API/Document/elementFromPoint /fr/docs/Web/API/DocumentOrShadowRoot/elementFromPoint -/fr/docs/Web/API/Document/getSelection /fr/docs/Web/API/DocumentOrShadowRoot/getSelection /fr/docs/Web/API/DocumentOrShadowRoot/activeElement /fr/docs/Web/API/Document/activeElement +/fr/docs/Web/API/DocumentOrShadowRoot/getSelection /fr/docs/Web/API/Document/getSelection /fr/docs/Web/API/DocumentOrShadowRoot/styleSheets /fr/docs/Web/API/Document/styleSheets /fr/docs/Web/API/Document_Object_Model/Exemples /fr/docs/Web/API/Document_Object_Model/Examples /fr/docs/Web/API/Document_Object_Model/Introduction_au_DOM /fr/docs/Web/API/Document_Object_Model/Introduction @@ -3996,7 +3996,7 @@ /fr/docs/Web/API/document.createElementNS /fr/docs/Web/API/Document/createElementNS /fr/docs/Web/API/document.createRange /fr/docs/Web/API/Document/createRange /fr/docs/Web/API/document.defaultView /fr/docs/Web/API/Document/defaultView -/fr/docs/Web/API/document.getSelection /fr/docs/Web/API/DocumentOrShadowRoot/getSelection +/fr/docs/Web/API/document.getSelection /fr/docs/Web/API/Document/getSelection /fr/docs/Web/API/document.head /fr/docs/Web/API/Document/head /fr/docs/Web/API/document.location /fr/docs/Web/API/Document/location /fr/docs/Web/API/document.querySelector /fr/docs/Web/API/Document/querySelector diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json index 082086a96f..1dc036a2a5 100644 --- a/files/fr/_wikihistory.json +++ b/files/fr/_wikihistory.json @@ -44980,16 +44980,6 @@ "BenoitL" ] }, - "Web/API/DocumentOrShadowRoot/getSelection": { - "modified": "2019-09-25T07:21:02.389Z", - "contributors": [ - "julienc", - "sudwebdesign", - "loella16", - "fscholz", - "FredPl" - ] - }, "Web/API/HTMLElement/accessKey": { "modified": "2019-03-23T22:24:43.588Z", "contributors": [ @@ -46002,5 +45992,15 @@ "contributors": [ "SphinxKnight" ] + }, + "Web/API/Document/getSelection": { + "modified": "2019-09-25T07:21:02.389Z", + "contributors": [ + "julienc", + "sudwebdesign", + "loella16", + "fscholz", + "FredPl" + ] } }
\ No newline at end of file diff --git a/files/fr/learn/server-side/django/skeleton_website/index.html b/files/fr/learn/server-side/django/skeleton_website/index.html index 787db15aec..9bf5f6e1ff 100644 --- a/files/fr/learn/server-side/django/skeleton_website/index.html +++ b/files/fr/learn/server-side/django/skeleton_website/index.html @@ -271,7 +271,7 @@ urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)</ </pre> <div class="note"> -<p><strong>Note</strong>: Il y a plusieurs manière pour ajouter des routes à la variable <code>urlpatterns</code> (dans les étapes décrites ci-dessus nous avons ajouté petit à patir en utilisant l'opérateur <code>+=</code> pour bien séparer les étapes). Il est en réalité tout à fait possible de toput regrouper dans une seule étape :</p> +<p><strong>Note</strong>: Il y a plusieurs manière pour ajouter des routes à la variable <code>urlpatterns</code> (dans les étapes décrites ci-dessus nous avons ajouté petit à patir en utilisant l'opérateur <code>+=</code> pour bien séparer les étapes). Il est en réalité tout à fait possible de tout regrouper dans une seule étape :</p> <pre class="brush: python notranslate">urlpatterns = [ path('admin/', admin.site.urls), diff --git a/files/fr/web/api/documentorshadowroot/getselection/index.html b/files/fr/web/api/document/getselection/index.html index dfe7b3a102..676ba4d351 100644 --- a/files/fr/web/api/documentorshadowroot/getselection/index.html +++ b/files/fr/web/api/document/getselection/index.html @@ -1,6 +1,6 @@ --- title: document.getSelection -slug: Web/API/DocumentOrShadowRoot/getSelection +slug: Web/API/Document/getSelection tags: - API - DOM @@ -9,7 +9,7 @@ tags: - Selection translation_of: Web/API/DocumentOrShadowRoot/getSelection translation_of_original: Web/API/Document/getSelection -original_slug: Web/API/Document/getSelection +original_slug: Web/API/DocumentOrShadowRoot/getSelection --- <p>{{APIRef("DOM")}}</p> diff --git a/files/fr/web/api/element/getattributens/index.html b/files/fr/web/api/element/getattributens/index.html index 1a256de5fa..ecd4a98493 100644 --- a/files/fr/web/api/element/getattributens/index.html +++ b/files/fr/web/api/element/getattributens/index.html @@ -36,7 +36,7 @@ translation_of: Web/API/Element/getAttributeNS <h2 id="Exemples">Exemples</h2> -<p>Le document SVG suivantu utilise une valeur d'attribut <code>foo</code> d'un espace de nom spécifique :</p> +<p>Le document SVG suivant utilise une valeur d'attribut <code>foo</code> d'un espace de nom spécifique :</p> <pre class="brush: xml"><svg xmlns="http://www.w3.org/2000/svg" xmlns:test="http://www.example.com/2014/test" width="40" height="40"> diff --git a/files/fr/web/svg/element/clippath/index.html b/files/fr/web/svg/element/clippath/index.html index 44ff32994f..276807168a 100644 --- a/files/fr/web/svg/element/clippath/index.html +++ b/files/fr/web/svg/element/clippath/index.html @@ -19,7 +19,7 @@ translation_of: Web/SVG/Element/clipPath <pre class="brush: html"><svg viewBox="0 0 100 100"> <clipPath id="myClip"> - <!-- La forme crée par le détourage est un simple cercle. --> + <!-- La forme créée par le détourage est un simple cercle. --> <circle cx="40" cy="35" r="35" /> </clipPath> diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index afbf74fa1e..6aeb1e8eaa 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -3747,12 +3747,12 @@ /ja/docs/Web/API/Document/defaultView/storage_event /ja/docs/Web/API/Window/storage_event /ja/docs/Web/API/Document/domConfig /ja/docs/Web/API/Document /ja/docs/Web/API/Document/elementFromPoint /ja/docs/Web/API/DocumentOrShadowRoot/elementFromPoint -/ja/docs/Web/API/Document/getSelection /ja/docs/conflicting/Web/API/DocumentOrShadowRoot/getSelection /ja/docs/Web/API/Document/inputEncoding /ja/docs/conflicting/Web/API/Document/characterSet /ja/docs/Web/API/Document/onselectionchange /ja/docs/Web/API/GlobalEventHandlers/onselectionchange /ja/docs/Web/API/DocumentOrShadowRoot/activeElement /ja/docs/Web/API/Document/activeElement /ja/docs/Web/API/DocumentOrShadowRoot/fullscreenElement /ja/docs/Web/API/Document/fullscreenElement /ja/docs/Web/API/DocumentOrShadowRoot/getAnimations /ja/docs/Web/API/Document/getAnimations +/ja/docs/Web/API/DocumentOrShadowRoot/getSelection /ja/docs/Web/API/Document/getSelection /ja/docs/Web/API/DocumentOrShadowRoot/msElementsFromRect /ja/docs/orphaned/Web/API/DocumentOrShadowRoot/msElementsFromRect /ja/docs/Web/API/DocumentOrShadowRoot/nodeFromPoint /ja/docs/conflicting/Web/API/DocumentOrShadowRoot /ja/docs/Web/API/DocumentOrShadowRoot/nodesFromPoint /ja/docs/conflicting/Web/API/DocumentOrShadowRoot_20ea0e1d91453a020aad3a16dbce16f1 diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json index 3da558db6a..565d2b1182 100644 --- a/files/ja/_wikihistory.json +++ b/files/ja/_wikihistory.json @@ -12743,12 +12743,6 @@ "mfuji09" ] }, - "Web/API/DocumentOrShadowRoot/getSelection": { - "modified": "2020-10-15T22:26:08.191Z", - "contributors": [ - "mfuji09" - ] - }, "Web/API/DocumentType": { "modified": "2020-10-15T22:09:56.256Z", "contributors": [ @@ -53496,5 +53490,11 @@ "contributors": [ "eltociear" ] + }, + "Web/API/Document/getSelection": { + "modified": "2020-10-15T22:26:08.191Z", + "contributors": [ + "mfuji09" + ] } }
\ No newline at end of file diff --git a/files/ja/web/api/documentorshadowroot/getselection/index.html b/files/ja/web/api/document/getselection/index.html index e201ed0675..81fc970c85 100644 --- a/files/ja/web/api/documentorshadowroot/getselection/index.html +++ b/files/ja/web/api/document/getselection/index.html @@ -1,6 +1,6 @@ --- title: DocumentOrShadowRoot.getSelection() -slug: Web/API/DocumentOrShadowRoot/getSelection +slug: Web/API/Document/getSelection tags: - API - DocumentOrShadowRoot @@ -12,6 +12,7 @@ tags: - getSelection() - shadow dom translation_of: Web/API/DocumentOrShadowRoot/getSelection +original_slug: Web/API/DocumentOrShadowRoot/getSelection --- <div>{{APIRef("DOM")}}{{SeeCompatTable}}</div> diff --git a/files/ja/web/javascript/reference/statements/switch/index.html b/files/ja/web/javascript/reference/statements/switch/index.html index 91960fb4ca..9d2d33b627 100644 --- a/files/ja/web/javascript/reference/statements/switch/index.html +++ b/files/ja/web/javascript/reference/statements/switch/index.html @@ -86,9 +86,7 @@ console.log("Is there anything else you'd like?"); <h3 id="What_happens_if_I_forgot_a_break" name="What_happens_if_I_forgot_a_break"><code>break</code> を置かないとどうなるか</h3> -<p><code>break</code> を置かな買った場合、スクリプトは基準を満たす <code>case</code> から実行され、その後の <code>case</code> も</p> - -<p>条件に合うかに関係なく実行されます。</p> +<p><code>break</code> を置かなかった場合、スクリプトは基準を満たす <code>case</code> から実行され、その後の <code>case</code> も条件に合うかに関係なく実行されます。</p> <p>こちらの例をご覧ください。</p> diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt index 256c8c220a..8d61ce0196 100644 --- a/files/ko/_redirects.txt +++ b/files/ko/_redirects.txt @@ -626,8 +626,8 @@ /ko/docs/Web/API/Document/defaultView/popstate_event /ko/docs/Web/API/Window/popstate_event /ko/docs/Web/API/Document/defaultView/resize_event /ko/docs/Web/API/Window/resize_event /ko/docs/Web/API/Document/drag_이벤트 /ko/docs/Web/API/Document/drag_event -/ko/docs/Web/API/Document/getSelection /ko/docs/Web/API/DocumentOrShadowRoot/getSelection /ko/docs/Web/API/DocumentOrShadowRoot/activeElement /ko/docs/Web/API/Document/activeElement +/ko/docs/Web/API/DocumentOrShadowRoot/getSelection /ko/docs/Web/API/Document/getSelection /ko/docs/Web/API/DocumentOrShadowRoot/styleSheets /ko/docs/Web/API/Document/styleSheets /ko/docs/Web/API/Document_Object_Model/Preface /ko/docs/Web/API/Document_Object_Model /ko/docs/Web/API/Document_Object_Model/소개 /ko/docs/Web/API/Document_Object_Model/Introduction diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json index 4fda3210dc..c7cbc472de 100644 --- a/files/ko/_wikihistory.json +++ b/files/ko/_wikihistory.json @@ -18249,12 +18249,6 @@ "Sebuls" ] }, - "Web/API/DocumentOrShadowRoot/getSelection": { - "modified": "2019-03-23T22:51:22.015Z", - "contributors": [ - "x86kernel" - ] - }, "Web/API/HTMLElement/accessKey": { "modified": "2020-10-15T22:14:28.158Z", "contributors": [ @@ -18704,5 +18698,11 @@ "alattalatta", "DeadIntegral" ] + }, + "Web/API/Document/getSelection": { + "modified": "2019-03-23T22:51:22.015Z", + "contributors": [ + "x86kernel" + ] } }
\ No newline at end of file diff --git a/files/ko/web/api/documentorshadowroot/getselection/index.html b/files/ko/web/api/document/getselection/index.html index dee63369ab..919e52e9b3 100644 --- a/files/ko/web/api/documentorshadowroot/getselection/index.html +++ b/files/ko/web/api/document/getselection/index.html @@ -1,9 +1,9 @@ --- title: Document.getSelection() -slug: Web/API/DocumentOrShadowRoot/getSelection +slug: Web/API/Document/getSelection translation_of: Web/API/DocumentOrShadowRoot/getSelection translation_of_original: Web/API/Document/getSelection -original_slug: Web/API/Document/getSelection +original_slug: Web/API/DocumentOrShadowRoot/getSelection --- <p>{{APIRef("DOM")}}</p> diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt index 85ac13ea5b..85c7b192d6 100644 --- a/files/pt-br/_redirects.txt +++ b/files/pt-br/_redirects.txt @@ -555,8 +555,8 @@ /pt-BR/docs/Web/API/Document/defaultView/popstate_event /pt-BR/docs/Web/API/Window/popstate_event /pt-BR/docs/Web/API/Document/defaultView/resize_event /pt-BR/docs/Web/API/Window/resize_event /pt-BR/docs/Web/API/Document/elementFromPoint /pt-BR/docs/Web/API/DocumentOrShadowRoot/elementFromPoint -/pt-BR/docs/Web/API/Document/getSelection /pt-BR/docs/Web/API/DocumentOrShadowRoot/getSelection /pt-BR/docs/Web/API/DocumentOrShadowRoot/activeElement /pt-BR/docs/Web/API/Document/activeElement +/pt-BR/docs/Web/API/DocumentOrShadowRoot/getSelection /pt-BR/docs/Web/API/Document/getSelection /pt-BR/docs/Web/API/DocumentoXML /pt-BR/docs/Web/API/XMLDocument /pt-BR/docs/Web/API/Element.addEventListener /pt-BR/docs/Web/API/EventTarget/addEventListener /pt-BR/docs/Web/API/Element.getAttribute /pt-BR/docs/Web/API/Element/getAttribute diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json index 8844ab7810..fc9965ff16 100644 --- a/files/pt-br/_wikihistory.json +++ b/files/pt-br/_wikihistory.json @@ -16964,12 +16964,6 @@ "cezaraugusto" ] }, - "Web/API/DocumentOrShadowRoot/getSelection": { - "modified": "2019-03-23T22:54:15.369Z", - "contributors": [ - "expalmer" - ] - }, "Web/API/HTMLElement/accessKey": { "modified": "2019-03-23T22:27:15.059Z", "contributors": [ @@ -17367,5 +17361,11 @@ "fernandosavio", "DiegoYungh" ] + }, + "Web/API/Document/getSelection": { + "modified": "2019-03-23T22:54:15.369Z", + "contributors": [ + "expalmer" + ] } }
\ No newline at end of file diff --git a/files/pt-br/web/api/documentorshadowroot/getselection/index.html b/files/pt-br/web/api/document/getselection/index.html index 11fff02755..24f7c5c180 100644 --- a/files/pt-br/web/api/documentorshadowroot/getselection/index.html +++ b/files/pt-br/web/api/document/getselection/index.html @@ -1,9 +1,9 @@ --- title: Document.getSelection() -slug: Web/API/DocumentOrShadowRoot/getSelection +slug: Web/API/Document/getSelection translation_of: Web/API/DocumentOrShadowRoot/getSelection translation_of_original: Web/API/Document/getSelection -original_slug: Web/API/Document/getSelection +original_slug: Web/API/DocumentOrShadowRoot/getSelection --- <p>{{APIRef("DOM")}}</p> diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt index 217bd711d9..e397148064 100644 --- a/files/ru/_redirects.txt +++ b/files/ru/_redirects.txt @@ -402,8 +402,8 @@ /ru/docs/Web/API/Document/defaultView/resize_event /ru/docs/Web/API/Window/resize_event /ru/docs/Web/API/Document/defaultView/storage_event /ru/docs/Web/API/Window/storage_event /ru/docs/Web/API/Document/domConfig /ru/docs/Web/API/Document -/ru/docs/Web/API/Document/getSelection /ru/docs/Web/API/DocumentOrShadowRoot/getSelection /ru/docs/Web/API/DocumentOrShadowRoot/activeElement /ru/docs/Web/API/Document/activeElement +/ru/docs/Web/API/DocumentOrShadowRoot/getSelection /ru/docs/Web/API/Document/getSelection /ru/docs/Web/API/Element.getBoundingClientRect /ru/docs/Web/API/Element/getBoundingClientRect /ru/docs/Web/API/Element.insertAdjacentHTML /ru/docs/Web/API/Element/insertAdjacentHTML /ru/docs/Web/API/Element/accessKey /ru/docs/Web/API/HTMLElement/accessKey diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json index 170225c76e..196f623a1a 100644 --- a/files/ru/_wikihistory.json +++ b/files/ru/_wikihistory.json @@ -25203,12 +25203,6 @@ "Aleksej" ] }, - "Web/API/DocumentOrShadowRoot/getSelection": { - "modified": "2019-03-23T22:34:05.751Z", - "contributors": [ - "YakovL" - ] - }, "Web/API/HTMLElement/accessKey": { "modified": "2019-03-23T22:51:14.902Z", "contributors": [ @@ -25988,5 +25982,11 @@ "contributors": [ "d0rj" ] + }, + "Web/API/Document/getSelection": { + "modified": "2019-03-23T22:34:05.751Z", + "contributors": [ + "YakovL" + ] } }
\ No newline at end of file diff --git a/files/ru/web/api/documentorshadowroot/getselection/index.html b/files/ru/web/api/document/getselection/index.html index ce4007b2f3..e04e36513d 100644 --- a/files/ru/web/api/documentorshadowroot/getselection/index.html +++ b/files/ru/web/api/document/getselection/index.html @@ -1,9 +1,9 @@ --- title: Document.getSelection() -slug: Web/API/DocumentOrShadowRoot/getSelection +slug: Web/API/Document/getSelection translation_of: Web/API/DocumentOrShadowRoot/getSelection translation_of_original: Web/API/Document/getSelection -original_slug: Web/API/Document/getSelection +original_slug: Web/API/DocumentOrShadowRoot/getSelection --- <p>{{APIRef("DOM")}}</p> diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt index 9ee008a3bd..3908924a1b 100644 --- a/files/zh-cn/_redirects.txt +++ b/files/zh-cn/_redirects.txt @@ -1485,7 +1485,6 @@ /zh-CN/docs/Web/API/Document/domConfig /zh-CN/docs/Web/API/Document /zh-CN/docs/Web/API/Document/elementFromPoint /zh-CN/docs/conflicting/Web/API/DocumentOrShadowRoot/elementFromPoint /zh-CN/docs/Web/API/Document/elementsFromPoint /zh-CN/docs/conflicting/Web/API/DocumentOrShadowRoot/elementsFromPoint -/zh-CN/docs/Web/API/Document/getSelection /zh-CN/docs/conflicting/Web/API/DocumentOrShadowRoot/getSelection /zh-CN/docs/Web/API/Document/inputEncoding /zh-CN/docs/conflicting/Web/API/Document/characterSet /zh-CN/docs/Web/API/Document/mozFullScreen /zh-CN/docs/Web/API/Document/fullscreen /zh-CN/docs/Web/API/Document/mozFullScreenElement /zh-CN/docs/Web/API/Document/fullscreenElement @@ -1494,6 +1493,7 @@ /zh-CN/docs/Web/API/Document/rouchmove_event /zh-CN/docs/Web/API/Document/touchmove_event /zh-CN/docs/Web/API/DocumentOrShadowRoot/activeElement /zh-CN/docs/Web/API/Document/activeElement /zh-CN/docs/Web/API/DocumentOrShadowRoot/fullscreenElement /zh-CN/docs/Web/API/Document/fullscreenElement +/zh-CN/docs/Web/API/DocumentOrShadowRoot/getSelection /zh-CN/docs/Web/API/Document/getSelection /zh-CN/docs/Web/API/DocumentOrShadowRoot/pointerLockElement /zh-CN/docs/Web/API/Document/pointerLockElement /zh-CN/docs/Web/API/DocumentOrShadowRoot/styleSheets /zh-CN/docs/Web/API/Document/styleSheets /zh-CN/docs/Web/API/Document_Object_Model/Preface /zh-CN/docs/conflicting/Web/API/Document_Object_Model diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json index 6bb3beb84a..524f81d1c5 100644 --- a/files/zh-cn/_wikihistory.json +++ b/files/zh-cn/_wikihistory.json @@ -10384,12 +10384,6 @@ "1Cr18Ni9" ] }, - "Web/API/DocumentOrShadowRoot/getSelection": { - "modified": "2020-10-15T22:12:59.602Z", - "contributors": [ - "WuCongMan" - ] - }, "Web/API/DocumentTouch": { "modified": "2019-03-23T22:57:10.414Z", "contributors": [ @@ -50798,5 +50792,11 @@ "contributors": [ "lastVigo" ] + }, + "Web/API/Document/getSelection": { + "modified": "2020-10-15T22:12:59.602Z", + "contributors": [ + "WuCongMan" + ] } }
\ No newline at end of file diff --git a/files/zh-cn/web/api/documentorshadowroot/getselection/index.html b/files/zh-cn/web/api/document/getselection/index.html index 7110d24d21..f3eca58f61 100644 --- a/files/zh-cn/web/api/documentorshadowroot/getselection/index.html +++ b/files/zh-cn/web/api/document/getselection/index.html @@ -1,7 +1,8 @@ --- title: DocumentOrShadowRoot.getSelection() -slug: Web/API/DocumentOrShadowRoot/getSelection +slug: Web/API/Document/getSelection translation_of: Web/API/DocumentOrShadowRoot/getSelection +original_slug: Web/API/DocumentOrShadowRoot/getSelection --- <div>{{APIRef("DOM")}}{{SeeCompatTable}}</div> |