diff options
Diffstat (limited to 'files/zh-cn')
| -rw-r--r-- | files/zh-cn/_redirects.txt | 15 | ||||
| -rw-r--r-- | files/zh-cn/_wikihistory.json | 128 | ||||
| -rw-r--r-- | files/zh-cn/conflicting/learn/javascript/asynchronous/index.html (renamed from files/zh-cn/learn/javascript/asynchronous/choosing_the_right_approach/index.html) | 4 | ||||
| -rw-r--r-- | files/zh-cn/conflicting/learn/javascript/asynchronous/introducing/index.html (renamed from files/zh-cn/learn/javascript/asynchronous/concepts/index.html) | 4 | ||||
| -rw-r--r-- | files/zh-cn/conflicting/learn/javascript/asynchronous/promises/index.html (renamed from files/zh-cn/learn/javascript/asynchronous/async_await/index.html) | 4 | ||||
| -rw-r--r-- | files/zh-cn/conflicting/learn/javascript/asynchronous_ae5a561b0ec11fc53c167201aa8af5df/index.html (renamed from files/zh-cn/learn/javascript/asynchronous/timeouts_and_intervals/index.html) | 4 | ||||
| -rw-r--r-- | files/zh-cn/conflicting/web/api/document/visibilitychange_event/index.html (renamed from files/zh-cn/web/api/document/onvisibilitychange/index.html) | 3 | ||||
| -rw-r--r-- | files/zh-cn/web/api/performance/resourcetimingbufferfull_event/index.html (renamed from files/zh-cn/web/api/performance/onresourcetimingbufferfull/index.html) | 3 | ||||
| -rw-r--r-- | files/zh-cn/web/api/window/appinstalled_event/index.html (renamed from files/zh-cn/web/api/window/onappinstalled/index.html) | 3 |
9 files changed, 89 insertions, 79 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt index 6789bcbf8c..1b57d8f385 100644 --- a/files/zh-cn/_redirects.txt +++ b/files/zh-cn/_redirects.txt @@ -1094,6 +1094,10 @@ /zh-CN/docs/Learn/HTML/Forms/Your_first_HTML_form /zh-CN/docs/Learn/Forms/Your_first_form /zh-CN/docs/Learn/HTML/Multimedia_and_embedding/其他嵌入技术 /zh-CN/docs/Learn/HTML/Multimedia_and_embedding/Other_embedding_technologies /zh-CN/docs/Learn/HTML/Multimedia_and_embedding/在网页中添加矢量图形 /zh-CN/docs/Learn/HTML/Multimedia_and_embedding/Adding_vector_graphics_to_the_Web +/zh-CN/docs/Learn/JavaScript/Asynchronous/Async_await /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous/Promises +/zh-CN/docs/Learn/JavaScript/Asynchronous/Choosing_the_right_approach /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous +/zh-CN/docs/Learn/JavaScript/Asynchronous/Concepts /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous/Introducing +/zh-CN/docs/Learn/JavaScript/Asynchronous/Timeouts_and_intervals /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous_ae5a561b0ec11fc53c167201aa8af5df /zh-CN/docs/Learn/JavaScript/First_steps/变量 /zh-CN/docs/Learn/JavaScript/First_steps/Variables /zh-CN/docs/Learn/JavaScript/First_steps/第一点 /zh-CN/docs/Learn/JavaScript/First_steps/A_first_splash /zh-CN/docs/Learn/JavaScript/Objects/Inheritance /zh-CN/docs/Learn/JavaScript/Objects/Classes_in_JavaScript @@ -1273,6 +1277,7 @@ /zh-CN/docs/Web/API/Document/onfullscreenchange /zh-CN/docs/conflicting/Web/API/Document/fullscreenchange_event /zh-CN/docs/Web/API/Document/onfullscreenerror /zh-CN/docs/Web/API/Document/fullscreenerror_event /zh-CN/docs/Web/API/Document/onreadystatechange /en-US/docs/Web/API/Document/readystatechange_event +/zh-CN/docs/Web/API/Document/onvisibilitychange /zh-CN/docs/conflicting/Web/API/Document/visibilitychange_event /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/elementFromPoint /zh-CN/docs/Web/API/Document/elementFromPoint @@ -1466,6 +1471,7 @@ /zh-CN/docs/Web/API/ParentNode.childElementCount /zh-CN/docs/Web/API/Element/childElementCount /zh-CN/docs/Web/API/ParentNode/childElementCount /zh-CN/docs/Web/API/Element/childElementCount /zh-CN/docs/Web/API/Performance.now() /zh-CN/docs/Web/API/Performance/now +/zh-CN/docs/Web/API/Performance/onresourcetimingbufferfull /zh-CN/docs/Web/API/Performance/resourcetimingbufferfull_event /zh-CN/docs/Web/API/Performance/内存 /zh-CN/docs/Web/API/Performance/memory /zh-CN/docs/Web/API/Position /zh-CN/docs/Web/API/GeolocationPosition /zh-CN/docs/Web/API/Position/coords /zh-CN/docs/Web/API/GeolocationPosition/coords @@ -1599,6 +1605,7 @@ /zh-CN/docs/Web/API/Window/crypto /zh-CN/docs/Web/API/crypto_property /zh-CN/docs/Web/API/Window/minimize /zh-CN/docs/conflicting/Web/API/Window /zh-CN/docs/Web/API/Window/mozAnimationStartTIme /zh-CN/docs/Web/API/Animation/startTime +/zh-CN/docs/Web/API/Window/onappinstalled /zh-CN/docs/Web/API/Window/appinstalled_event /zh-CN/docs/Web/API/Window/onbeforeunload /zh-CN/docs/Web/API/WindowEventHandlers/onbeforeunload /zh-CN/docs/Web/API/Window/ongamepadconnected /zh-CN/docs/conflicting/Web/API/Window/gamepadconnected_event /zh-CN/docs/Web/API/Window/ongamepaddisconnected /zh-CN/docs/Web/API/Window/gamepaddisconnected_event @@ -2284,12 +2291,12 @@ /zh-CN/docs/learn/JavaScript/Building_blocks/事件 /zh-CN/docs/Learn/JavaScript/Building_blocks/Events /zh-CN/docs/learn/JavaScript/Building_blocks/相片走廊 /zh-CN/docs/Learn/JavaScript/Building_blocks/Image_gallery /zh-CN/docs/learn/JavaScript/异步 /zh-CN/docs/Learn/JavaScript/Asynchronous -/zh-CN/docs/learn/JavaScript/异步/Async_await /zh-CN/docs/Learn/JavaScript/Asynchronous/Async_await -/zh-CN/docs/learn/JavaScript/异步/Choosing_the_right_approach /zh-CN/docs/Learn/JavaScript/Asynchronous/Choosing_the_right_approach +/zh-CN/docs/learn/JavaScript/异步/Async_await /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous/Promises +/zh-CN/docs/learn/JavaScript/异步/Choosing_the_right_approach /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous /zh-CN/docs/learn/JavaScript/异步/Promises语法 /zh-CN/docs/Learn/JavaScript/Asynchronous/Promises -/zh-CN/docs/learn/JavaScript/异步/概念 /zh-CN/docs/Learn/JavaScript/Asynchronous/Concepts +/zh-CN/docs/learn/JavaScript/异步/概念 /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous/Introducing /zh-CN/docs/learn/JavaScript/异步/简介 /zh-CN/docs/Learn/JavaScript/Asynchronous/Introducing -/zh-CN/docs/learn/JavaScript/异步/超时和间隔 /zh-CN/docs/Learn/JavaScript/Asynchronous/Timeouts_and_intervals +/zh-CN/docs/learn/JavaScript/异步/超时和间隔 /zh-CN/docs/conflicting/Learn/JavaScript/Asynchronous_ae5a561b0ec11fc53c167201aa8af5df /zh-CN/docs/learn/Performance/CSS_performance /zh-CN/docs/Learn/Performance/CSS /zh-CN/docs/learn/Performance/dns-prefetch /zh-CN/docs/Web/Performance/dns-prefetch /zh-CN/docs/learn/Performance/感知性能 /zh-CN/docs/Learn/Performance/perceived_performance diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json index 04de070975..79ea90a611 100644 --- a/files/zh-cn/_wikihistory.json +++ b/files/zh-cn/_wikihistory.json @@ -4173,40 +4173,6 @@ "oceanMIH" ] }, - "Learn/JavaScript/Asynchronous/Async_await": { - "modified": "2020-12-08T06:58:32.883Z", - "contributors": [ - "byrde", - "woniuxingdong", - "qwei", - "plainnany", - "jakio6", - "awarmy", - "cochn", - "wangfangping" - ] - }, - "Learn/JavaScript/Asynchronous/Choosing_the_right_approach": { - "modified": "2020-12-08T07:27:41.218Z", - "contributors": [ - "byrde", - "icetea_cover", - "rubyKC", - "shangruitong", - "PYGC", - "wangfangping", - "tjls" - ] - }, - "Learn/JavaScript/Asynchronous/Concepts": { - "modified": "2020-07-16T22:33:29.726Z", - "contributors": [ - "alice201601", - "grape", - "HermitSun", - "oceanMIH" - ] - }, "Learn/JavaScript/Asynchronous/Introducing": { "modified": "2020-12-09T00:17:16.227Z", "contributors": [ @@ -4236,22 +4202,6 @@ "zijieee" ] }, - "Learn/JavaScript/Asynchronous/Timeouts_and_intervals": { - "modified": "2020-08-14T06:09:20.310Z", - "contributors": [ - "Pada", - "You2er", - "WinterCicada", - "zhangbig0", - "mizhon", - "yuqing521", - "Alendia", - "grape", - "wangfangping", - "puddlejumper26", - "oceanMIH" - ] - }, "Learn/JavaScript/Building_blocks/Events": { "modified": "2020-08-04T06:06:58.173Z", "contributors": [ @@ -11302,12 +11252,6 @@ "githubyangwei" ] }, - "Web/API/Document/onvisibilitychange": { - "modified": "2020-10-15T22:25:06.098Z", - "contributors": [ - "wangzhongchunongithub" - ] - }, "Web/API/Document/open": { "modified": "2020-10-15T21:52:24.168Z", "contributors": [ @@ -18297,7 +18241,7 @@ "ziyunfei" ] }, - "Web/API/Performance/onresourcetimingbufferfull": { + "Web/API/Performance/resourcetimingbufferfull_event": { "modified": "2019-03-23T22:09:51.120Z", "contributors": [ "Pada" @@ -22603,6 +22547,13 @@ "ziyunfei" ] }, + "Web/API/Window/appinstalled_event": { + "modified": "2019-03-18T21:40:44.436Z", + "contributors": [ + "Aaron_Zhung", + "echoArray" + ] + }, "Web/API/Window/applicationCache": { "modified": "2019-03-23T23:31:44.274Z", "contributors": [ @@ -23104,13 +23055,6 @@ "charlie" ] }, - "Web/API/Window/onappinstalled": { - "modified": "2019-03-18T21:40:44.436Z", - "contributors": [ - "Aaron_Zhung", - "echoArray" - ] - }, "Web/API/Window/onbeforeinstallprompt": { "modified": "2019-03-23T22:11:25.289Z", "contributors": [ @@ -46637,6 +46581,56 @@ "shenhao" ] }, + "conflicting/Learn/JavaScript/Asynchronous": { + "modified": "2020-12-08T07:27:41.218Z", + "contributors": [ + "byrde", + "icetea_cover", + "rubyKC", + "shangruitong", + "PYGC", + "wangfangping", + "tjls" + ] + }, + "conflicting/Learn/JavaScript/Asynchronous/Introducing": { + "modified": "2020-07-16T22:33:29.726Z", + "contributors": [ + "alice201601", + "grape", + "HermitSun", + "oceanMIH" + ] + }, + "conflicting/Learn/JavaScript/Asynchronous/Promises": { + "modified": "2020-12-08T06:58:32.883Z", + "contributors": [ + "byrde", + "woniuxingdong", + "qwei", + "plainnany", + "jakio6", + "awarmy", + "cochn", + "wangfangping" + ] + }, + "conflicting/Learn/JavaScript/Asynchronous_ae5a561b0ec11fc53c167201aa8af5df": { + "modified": "2020-08-14T06:09:20.310Z", + "contributors": [ + "Pada", + "You2er", + "WinterCicada", + "zhangbig0", + "mizhon", + "yuqing521", + "Alendia", + "grape", + "wangfangping", + "puddlejumper26", + "oceanMIH" + ] + }, "conflicting/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents": { "modified": "2019-03-23T23:14:19.406Z", "contributors": [ @@ -46836,6 +46830,12 @@ "sunnylost" ] }, + "conflicting/Web/API/Document/visibilitychange_event": { + "modified": "2020-10-15T22:25:06.098Z", + "contributors": [ + "wangzhongchunongithub" + ] + }, "conflicting/Web/API/DocumentOrShadowRoot/elementFromPoint": { "modified": "2019-03-23T23:19:33.886Z", "contributors": [ diff --git a/files/zh-cn/learn/javascript/asynchronous/choosing_the_right_approach/index.html b/files/zh-cn/conflicting/learn/javascript/asynchronous/index.html index 4241740479..278746ae22 100644 --- a/files/zh-cn/learn/javascript/asynchronous/choosing_the_right_approach/index.html +++ b/files/zh-cn/conflicting/learn/javascript/asynchronous/index.html @@ -1,8 +1,8 @@ --- title: 选择正确的方法 -slug: Learn/JavaScript/Asynchronous/Choosing_the_right_approach +slug: conflicting/Learn/JavaScript/Asynchronous translation_of: Learn/JavaScript/Asynchronous/Choosing_the_right_approach -original_slug: learn/JavaScript/异步/Choosing_the_right_approach +original_slug: Learn/JavaScript/Asynchronous/Choosing_the_right_approach --- <div>{{LearnSidebar}}</div> diff --git a/files/zh-cn/learn/javascript/asynchronous/concepts/index.html b/files/zh-cn/conflicting/learn/javascript/asynchronous/introducing/index.html index 757eee777c..291cf15837 100644 --- a/files/zh-cn/learn/javascript/asynchronous/concepts/index.html +++ b/files/zh-cn/conflicting/learn/javascript/asynchronous/introducing/index.html @@ -1,6 +1,6 @@ --- title: 通用异步编程概念 -slug: Learn/JavaScript/Asynchronous/Concepts +slug: conflicting/Learn/JavaScript/Asynchronous/Introducing tags: - JavaScript - Promises @@ -9,7 +9,7 @@ tags: - 异步 - 阻塞 translation_of: Learn/JavaScript/Asynchronous/Concepts -original_slug: learn/JavaScript/异步/概念 +original_slug: Learn/JavaScript/Asynchronous/Concepts --- <div>{{LearnSidebar}}{{NextMenu("Learn/JavaScript/Asynchronous/Introducing", "Learn/JavaScript/Asynchronous")}}</div> diff --git a/files/zh-cn/learn/javascript/asynchronous/async_await/index.html b/files/zh-cn/conflicting/learn/javascript/asynchronous/promises/index.html index d584914106..3c73fecd3d 100644 --- a/files/zh-cn/learn/javascript/asynchronous/async_await/index.html +++ b/files/zh-cn/conflicting/learn/javascript/asynchronous/promises/index.html @@ -1,8 +1,8 @@ --- title: async和await:让异步编程更简单 -slug: Learn/JavaScript/Asynchronous/Async_await +slug: conflicting/Learn/JavaScript/Asynchronous/Promises translation_of: Learn/JavaScript/Asynchronous/Async_await -original_slug: learn/JavaScript/异步/Async_await +original_slug: Learn/JavaScript/Asynchronous/Async_await --- <div>{{LearnSidebar}}</div> diff --git a/files/zh-cn/learn/javascript/asynchronous/timeouts_and_intervals/index.html b/files/zh-cn/conflicting/learn/javascript/asynchronous_ae5a561b0ec11fc53c167201aa8af5df/index.html index 0819a5aff0..a3500922af 100644 --- a/files/zh-cn/learn/javascript/asynchronous/timeouts_and_intervals/index.html +++ b/files/zh-cn/conflicting/learn/javascript/asynchronous_ae5a561b0ec11fc53c167201aa8af5df/index.html @@ -1,8 +1,8 @@ --- title: '合作异步JavaScript: 超时和间隔' -slug: Learn/JavaScript/Asynchronous/Timeouts_and_intervals +slug: conflicting/Learn/JavaScript/Asynchronous_ae5a561b0ec11fc53c167201aa8af5df translation_of: Learn/JavaScript/Asynchronous/Timeouts_and_intervals -original_slug: learn/JavaScript/异步/超时和间隔 +original_slug: Learn/JavaScript/Asynchronous/Timeouts_and_intervals --- <div>{{LearnSidebar}}</div> diff --git a/files/zh-cn/web/api/document/onvisibilitychange/index.html b/files/zh-cn/conflicting/web/api/document/visibilitychange_event/index.html index 22fb0e4db4..e79fcf4cf9 100644 --- a/files/zh-cn/web/api/document/onvisibilitychange/index.html +++ b/files/zh-cn/conflicting/web/api/document/visibilitychange_event/index.html @@ -1,7 +1,8 @@ --- title: Document.onvisibilitychange -slug: Web/API/Document/onvisibilitychange +slug: conflicting/Web/API/Document/visibilitychange_event translation_of: Web/API/Document/onvisibilitychange +original_slug: Web/API/Document/onvisibilitychange --- <div>{{ApiRef('DOM')}}</div> diff --git a/files/zh-cn/web/api/performance/onresourcetimingbufferfull/index.html b/files/zh-cn/web/api/performance/resourcetimingbufferfull_event/index.html index 7e26cf4793..0b5890b069 100644 --- a/files/zh-cn/web/api/performance/onresourcetimingbufferfull/index.html +++ b/files/zh-cn/web/api/performance/resourcetimingbufferfull_event/index.html @@ -1,7 +1,8 @@ --- title: Performance.onresourcetimingbufferfull -slug: Web/API/Performance/onresourcetimingbufferfull +slug: Web/API/Performance/resourcetimingbufferfull_event translation_of: Web/API/Performance/onresourcetimingbufferfull +original_slug: Web/API/Performance/onresourcetimingbufferfull --- <div>{{APIRef("Resource Timing API")}}</div> diff --git a/files/zh-cn/web/api/window/onappinstalled/index.html b/files/zh-cn/web/api/window/appinstalled_event/index.html index 21662ca3f6..f5f098c903 100644 --- a/files/zh-cn/web/api/window/onappinstalled/index.html +++ b/files/zh-cn/web/api/window/appinstalled_event/index.html @@ -1,7 +1,8 @@ --- title: Window.onappinstalled -slug: Web/API/Window/onappinstalled +slug: Web/API/Window/appinstalled_event translation_of: Web/API/Window/onappinstalled +original_slug: Web/API/Window/onappinstalled --- <div>{{APIRef}}</div> |