aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn
diff options
context:
space:
mode:
Diffstat (limited to 'files/zh-cn')
-rw-r--r--files/zh-cn/_redirects.txt3
-rw-r--r--files/zh-cn/_wikihistory.json50
-rw-r--r--files/zh-cn/conflicting/web/api/uievent/which/index.html (renamed from files/zh-cn/web/api/mouseevent/which/index.html)3
-rw-r--r--files/zh-cn/conflicting/web/javascript/reference/global_objects/string/index.html (renamed from files/zh-cn/web/api/bytestring/index.html)3
-rw-r--r--files/zh-cn/web/api/uievent/which/index.html (renamed from files/zh-cn/web/api/keyboardevent/which/index.html)3
5 files changed, 24 insertions, 38 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index ff820f35f0..35d2de28cb 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1235,6 +1235,7 @@
/zh-CN/docs/Web/API/Blob.size /zh-CN/docs/Web/API/Blob/size
/zh-CN/docs/Web/API/Blob.slice /zh-CN/docs/Web/API/Blob/slice
/zh-CN/docs/Web/API/Blob.type /zh-CN/docs/Web/API/Blob/type
+/zh-CN/docs/Web/API/ByteString /zh-CN/docs/conflicting/Web/JavaScript/Reference/Global_Objects/String
/zh-CN/docs/Web/API/CSSStyleSheet.insertRule /zh-CN/docs/Web/API/CSSStyleSheet/insertRule
/zh-CN/docs/Web/API/CSS分页规则 /zh-CN/docs/Web/API/CSSPageRule
/zh-CN/docs/Web/API/CanvasCaptureMediaStream /zh-CN/docs/Web/API/CanvasCaptureMediaStreamTrack
@@ -1381,8 +1382,10 @@
/zh-CN/docs/Web/API/Index /zh-CN/docs/conflicting/Web/API
/zh-CN/docs/Web/API/IndexedDB_API/IDBObjectStore /zh-CN/docs/Web/API/IDBObjectStore
/zh-CN/docs/Web/API/Intersection_Observer_API/点观察者API的时序元素可见性 /zh-CN/docs/Web/API/Intersection_Observer_API/Timing_element_visibility
+/zh-CN/docs/Web/API/KeyboardEvent/which /zh-CN/docs/Web/API/UIEvent/which
/zh-CN/docs/Web/API/Location.replace /zh-CN/docs/Web/API/Location/replace
/zh-CN/docs/Web/API/MediaStream.addTrack /zh-CN/docs/Web/API/MediaStream/addTrack
+/zh-CN/docs/Web/API/MouseEvent/which /zh-CN/docs/conflicting/Web/API/UIEvent/which
/zh-CN/docs/Web/API/Navigator.battery /zh-CN/docs/Web/API/Navigator/battery
/zh-CN/docs/Web/API/Navigator.buildID /zh-CN/docs/Web/API/Navigator/buildID
/zh-CN/docs/Web/API/Navigator.cookieEnabled /zh-CN/docs/Web/API/Navigator/cookieEnabled
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index ea8dba13d9..1d166827cc 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -8264,13 +8264,6 @@
"Spikef"
]
},
- "Web/API/ByteString": {
- "modified": "2019-07-13T11:30:42.104Z",
- "contributors": [
- "RainSlide",
- "zhouxu"
- ]
- },
"Web/API/CDATASection": {
"modified": "2020-10-15T21:50:11.923Z",
"contributors": [
@@ -16601,12 +16594,6 @@
"cuixiping"
]
},
- "Web/API/KeyboardEvent/which": {
- "modified": "2020-10-15T22:35:00.980Z",
- "contributors": [
- "xgqfrms"
- ]
- },
"Web/API/LocalFileSystemSync": {
"modified": "2019-03-23T22:09:04.520Z",
"contributors": [
@@ -17290,12 +17277,6 @@
"Dcfm"
]
},
- "Web/API/MouseEvent/which": {
- "modified": "2019-03-18T21:11:17.379Z",
- "contributors": [
- "WayneCui"
- ]
- },
"Web/API/MouseEvent/x": {
"modified": "2019-03-23T22:05:16.814Z",
"contributors": [
@@ -20821,6 +20802,12 @@
"pans9"
]
},
+ "Web/API/UIEvent/which": {
+ "modified": "2020-10-15T22:35:00.980Z",
+ "contributors": [
+ "xgqfrms"
+ ]
+ },
"Web/API/URL": {
"modified": "2020-10-15T21:33:08.666Z",
"contributors": [
@@ -47300,6 +47287,12 @@
"hibernake"
]
},
+ "conflicting/Web/API/UIEvent/which": {
+ "modified": "2019-03-18T21:11:17.379Z",
+ "contributors": [
+ "WayneCui"
+ ]
+ },
"conflicting/Web/API/URL": {
"modified": "2019-03-23T22:22:37.359Z",
"contributors": [
@@ -47829,23 +47822,10 @@
]
},
"conflicting/Web/JavaScript/Reference/Global_Objects/String": {
- "modified": "2020-10-15T21:27:29.084Z",
+ "modified": "2019-07-13T11:30:42.104Z",
"contributors": [
- "gqbre",
- "pabloyshi",
- "zhazhjie",
- "zqyue",
- "Ende93",
- "midare",
- "Yuxuan_Jiang",
- "micheal-death",
- "xgqfrms-GitHub",
- "Hugh",
- "terrycafe520",
- "qianjiahao",
- "paddingme",
- "teoli",
- "ziyunfei"
+ "RainSlide",
+ "zhouxu"
]
},
"conflicting/Web/JavaScript/Reference/Global_Objects/Symbol": {
diff --git a/files/zh-cn/web/api/mouseevent/which/index.html b/files/zh-cn/conflicting/web/api/uievent/which/index.html
index 591412dda3..760958f975 100644
--- a/files/zh-cn/web/api/mouseevent/which/index.html
+++ b/files/zh-cn/conflicting/web/api/uievent/which/index.html
@@ -1,12 +1,13 @@
---
title: MouseEvent.which
-slug: Web/API/MouseEvent/which
+slug: conflicting/Web/API/UIEvent/which
tags:
- API
- 只读
- 非标准
- 鼠标事件
translation_of: Web/API/MouseEvent/which
+original_slug: Web/API/MouseEvent/which
---
<p>{{APIRef("DOM Events")}}</p>
diff --git a/files/zh-cn/web/api/bytestring/index.html b/files/zh-cn/conflicting/web/javascript/reference/global_objects/string/index.html
index 7c3c0d004f..b2da7aeebf 100644
--- a/files/zh-cn/web/api/bytestring/index.html
+++ b/files/zh-cn/conflicting/web/javascript/reference/global_objects/string/index.html
@@ -1,6 +1,6 @@
---
title: ByteString
-slug: Web/API/ByteString
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/String
tags:
- API
- DOM
@@ -9,6 +9,7 @@ tags:
- 参考
- 字符串
translation_of: Web/API/ByteString
+original_slug: Web/API/ByteString
---
<p>{{APIRef("DOM")}}</p>
diff --git a/files/zh-cn/web/api/keyboardevent/which/index.html b/files/zh-cn/web/api/uievent/which/index.html
index 56136f398e..b94bab0616 100644
--- a/files/zh-cn/web/api/keyboardevent/which/index.html
+++ b/files/zh-cn/web/api/uievent/which/index.html
@@ -1,6 +1,6 @@
---
title: KeyboardEvent.which
-slug: Web/API/KeyboardEvent/which
+slug: Web/API/UIEvent/which
tags:
- Code
- DOM
@@ -9,6 +9,7 @@ tags:
- keyCode
- which
translation_of: Web/API/KeyboardEvent/which
+original_slug: Web/API/KeyboardEvent/which
---
<div>{{ APIRef("DOM Events") }} {{Deprecated_header}}</div>