diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt index d340abc3163627..530a03f624155c 100644 --- a/files/zh-cn/_redirects.txt +++ b/files/zh-cn/_redirects.txt @@ -2093,6 +2093,11 @@ /zh-CN/docs/Web/API/RTCStats /zh-CN/docs/Web/API/RTCStatsReport /zh-CN/docs/Web/API/RTCStats/id /zh-CN/docs/Web/API/RTCStatsReport /zh-CN/docs/Web/API/RandomSource/getRandomValues /zh-CN/docs/Web/API/Crypto/getRandomValues +/zh-CN/docs/Web/API/Range/collapsed /zh-CN/docs/conflicting/Web/API/AbstractRange/collapsed +/zh-CN/docs/Web/API/Range/endContainer /zh-CN/docs/conflicting/Web/API/AbstractRange/endContainer +/zh-CN/docs/Web/API/Range/endOffset /zh-CN/docs/conflicting/Web/API/AbstractRange/endOffset +/zh-CN/docs/Web/API/Range/startContainer /zh-CN/docs/conflicting/Web/API/AbstractRange/startContainer +/zh-CN/docs/Web/API/Range/startOffset /zh-CN/docs/conflicting/Web/API/AbstractRange/startOffset /zh-CN/docs/Web/API/Resource_Timing_API /zh-CN/docs/Web/API/Performance_API/Resource_timing /zh-CN/docs/Web/API/Resource_Timing_API/Using_the_Resource_Timing_API /zh-CN/docs/Web/API/Performance_API/Resource_timing /zh-CN/docs/Web/API/Response/error /zh-CN/docs/Web/API/Response/error_static @@ -2410,7 +2415,7 @@ /zh-CN/docs/Web/API/performance_property /zh-CN/docs/Web/API/Window/performance /zh-CN/docs/Web/API/queueMicrotask /zh-CN/docs/Web/API/Window/queueMicrotask /zh-CN/docs/Web/API/range.getBoundingClientRect /zh-CN/docs/Web/API/Range/getBoundingClientRect -/zh-CN/docs/Web/API/range.startOffset /zh-CN/docs/Web/API/Range/startOffset +/zh-CN/docs/Web/API/range.startOffset /zh-CN/docs/conflicting/Web/API/AbstractRange/startOffset /zh-CN/docs/Web/API/range.surroundContents /zh-CN/docs/Web/API/Range/surroundContents /zh-CN/docs/Web/API/setInterval /zh-CN/docs/Web/API/Window/setInterval /zh-CN/docs/Web/API/setTimeout /zh-CN/docs/Web/API/Window/setTimeout diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json index 1aaf04464a8a53..1088b776827022 100644 --- a/files/zh-cn/_wikihistory.json +++ b/files/zh-cn/_wikihistory.json @@ -17169,13 +17169,6 @@ "enem" ] }, - "Web/API/Range/collapsed": { - "modified": "2019-03-23T22:22:29.507Z", - "contributors": [ - "GentleMint", - "Smart" - ] - }, "Web/API/Range/commonAncestorContainer": { "modified": "2020-10-15T22:16:13.137Z", "contributors": [ @@ -17194,19 +17187,6 @@ "lbwa" ] }, - "Web/API/Range/endContainer": { - "modified": "2019-03-18T21:42:17.127Z", - "contributors": [ - "Hyiker" - ] - }, - "Web/API/Range/endOffset": { - "modified": "2020-10-15T22:04:46.141Z", - "contributors": [ - "Carllllo", - "gnepnaiL-oahZ" - ] - }, "Web/API/Range/extractContents": { "modified": "2020-10-15T21:50:21.817Z", "contributors": [ @@ -17279,21 +17259,6 @@ "loszer" ] }, - "Web/API/Range/startContainer": { - "modified": "2019-03-23T22:02:05.516Z", - "contributors": [ - "li5454yong" - ] - }, - "Web/API/Range/startOffset": { - "modified": "2020-10-15T21:28:32.328Z", - "contributors": [ - "Carllllo", - "teoli", - "khalid32", - "Losses" - ] - }, "Web/API/Range/surroundContents": { "modified": "2020-10-15T21:31:39.712Z", "contributors": [ @@ -42723,5 +42688,40 @@ "contributors": [ "Cyandev" ] + }, + "conflicting/Web/API/AbstractRange/collapsed": { + "modified": "2019-03-23T22:22:29.507Z", + "contributors": [ + "GentleMint", + "Smart" + ] + }, + "conflicting/Web/API/AbstractRange/endContainer": { + "modified": "2019-03-18T21:42:17.127Z", + "contributors": [ + "Hyiker" + ] + }, + "conflicting/Web/API/AbstractRange/endOffset": { + "modified": "2020-10-15T22:04:46.141Z", + "contributors": [ + "Carllllo", + "gnepnaiL-oahZ" + ] + }, + "conflicting/Web/API/AbstractRange/startContainer": { + "modified": "2019-03-23T22:02:05.516Z", + "contributors": [ + "li5454yong" + ] + }, + "conflicting/Web/API/AbstractRange/startOffset": { + "modified": "2020-10-15T21:28:32.328Z", + "contributors": [ + "Carllllo", + "teoli", + "khalid32", + "Losses" + ] } } diff --git a/files/zh-cn/web/api/range/collapsed/index.md b/files/zh-cn/conflicting/web/api/abstractrange/collapsed/index.md similarity index 84% rename from files/zh-cn/web/api/range/collapsed/index.md rename to files/zh-cn/conflicting/web/api/abstractrange/collapsed/index.md index 9527be693df0d9..59f2730c62ec7f 100644 --- a/files/zh-cn/web/api/range/collapsed/index.md +++ b/files/zh-cn/conflicting/web/api/abstractrange/collapsed/index.md @@ -1,6 +1,9 @@ --- title: Range:collapsed 属性 -slug: Web/API/Range/collapsed +slug: conflicting/Web/API/AbstractRange/collapsed +page-type: web-api-instance-property +browser-compat: api.AbstractRange.collapsed +original_slug: Web/API/Range/collapsed l10n: sourceCommit: c58e8c1dd6ecbcb63894c7dd17fb9495b9511b4e --- diff --git a/files/zh-cn/web/api/range/endcontainer/index.md b/files/zh-cn/conflicting/web/api/abstractrange/endcontainer/index.md similarity index 78% rename from files/zh-cn/web/api/range/endcontainer/index.md rename to files/zh-cn/conflicting/web/api/abstractrange/endcontainer/index.md index 635a43cce6d563..c4ee1fe582cb20 100644 --- a/files/zh-cn/web/api/range/endcontainer/index.md +++ b/files/zh-cn/conflicting/web/api/abstractrange/endcontainer/index.md @@ -1,6 +1,9 @@ --- title: Range.endContainer -slug: Web/API/Range/endContainer +slug: conflicting/Web/API/AbstractRange/endContainer +page-type: web-api-instance-property +browser-compat: api.AbstractRange.endContainer +original_slug: Web/API/Range/endContainer --- {{ApiRef("DOM")}} diff --git a/files/zh-cn/web/api/range/endoffset/index.md b/files/zh-cn/conflicting/web/api/abstractrange/endoffset/index.md similarity index 86% rename from files/zh-cn/web/api/range/endoffset/index.md rename to files/zh-cn/conflicting/web/api/abstractrange/endoffset/index.md index 62f8cd70ea85a4..73a2ff6781c63d 100644 --- a/files/zh-cn/web/api/range/endoffset/index.md +++ b/files/zh-cn/conflicting/web/api/abstractrange/endoffset/index.md @@ -1,6 +1,9 @@ --- title: Range:endOffset 属性 -slug: Web/API/Range/endOffset +slug: conflicting/Web/API/AbstractRange/endOffset +page-type: web-api-instance-property +browser-compat: api.AbstractRange.endOffset +original_slug: Web/API/Range/endOffset l10n: sourceCommit: c58e8c1dd6ecbcb63894c7dd17fb9495b9511b4e --- diff --git a/files/zh-cn/web/api/range/startcontainer/index.md b/files/zh-cn/conflicting/web/api/abstractrange/startcontainer/index.md similarity index 77% rename from files/zh-cn/web/api/range/startcontainer/index.md rename to files/zh-cn/conflicting/web/api/abstractrange/startcontainer/index.md index 3225037b16141f..638f86ed7b0ccc 100644 --- a/files/zh-cn/web/api/range/startcontainer/index.md +++ b/files/zh-cn/conflicting/web/api/abstractrange/startcontainer/index.md @@ -1,6 +1,9 @@ --- title: Range:startContainer 属性 -slug: Web/API/Range/startContainer +slug: conflicting/Web/API/AbstractRange/startContainer +page-type: web-api-instance-property +browser-compat: api.AbstractRange.startContainer +original_slug: Web/API/Range/startContainer l10n: sourceCommit: c58e8c1dd6ecbcb63894c7dd17fb9495b9511b4e --- diff --git a/files/zh-cn/web/api/range/startoffset/index.md b/files/zh-cn/conflicting/web/api/abstractrange/startoffset/index.md similarity index 85% rename from files/zh-cn/web/api/range/startoffset/index.md rename to files/zh-cn/conflicting/web/api/abstractrange/startoffset/index.md index 155bdf8d9e1179..88c16d5b4a73e1 100644 --- a/files/zh-cn/web/api/range/startoffset/index.md +++ b/files/zh-cn/conflicting/web/api/abstractrange/startoffset/index.md @@ -1,6 +1,9 @@ --- title: Range:startOffset 属性 -slug: Web/API/Range/startOffset +slug: conflicting/Web/API/AbstractRange/startOffset +page-type: web-api-instance-property +browser-compat: api.AbstractRange.startOffset +original_slug: Web/API/Range/startOffset l10n: sourceCommit: c58e8c1dd6ecbcb63894c7dd17fb9495b9511b4e ---