aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2022-01-16 00:57:29 +0000
committerMDN <actions@users.noreply.github.com>2022-01-16 00:57:29 +0000
commit32ce5de47456ff5d8cb1b2d9163356ce27ffe955 (patch)
tree44e7c321352aaeaf6996c758a2355cde9ac56c70 /files/zh-cn
parent2643908ba6acced84a9e92dbd037fc3c62f10b15 (diff)
downloadtranslated-content-32ce5de47456ff5d8cb1b2d9163356ce27ffe955.tar.gz
translated-content-32ce5de47456ff5d8cb1b2d9163356ce27ffe955.tar.bz2
translated-content-32ce5de47456ff5d8cb1b2d9163356ce27ffe955.zip
[CRON] sync translated content
Diffstat (limited to 'files/zh-cn')
-rw-r--r--files/zh-cn/_redirects.txt1
-rw-r--r--files/zh-cn/_wikihistory.json14
-rw-r--r--files/zh-cn/conflicting/web/api/pointer_events/index.html (renamed from files/zh-cn/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html)3
3 files changed, 10 insertions, 8 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 70c0330c9b..1a0110161e 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1496,6 +1496,7 @@
/zh-CN/docs/Web/API/Touch.screenX /zh-CN/docs/Web/API/Touch/screenX
/zh-CN/docs/Web/API/Touch.screenY /zh-CN/docs/Web/API/Touch/screenY
/zh-CN/docs/Web/API/TouchEvent.changedTouches /zh-CN/docs/Web/API/TouchEvent/changedTouches
+/zh-CN/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /zh-CN/docs/conflicting/Web/API/Pointer_events
/zh-CN/docs/Web/API/UIEvent/pageX /zh-CN/docs/conflicting/Web/API/MouseEvent/pageX
/zh-CN/docs/Web/API/UIEvent/pageY /zh-CN/docs/conflicting/Web/API/MouseEvent/pageY
/zh-CN/docs/Web/API/UIEvent/视图 /zh-CN/docs/Web/API/UIEvent/view
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 5b817efe66..316c67967b 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -20645,13 +20645,6 @@
"meteorlxy"
]
},
- "Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent": {
- "modified": "2019-08-24T04:59:47.192Z",
- "contributors": [
- "ouxuwen",
- "meteorlxy"
- ]
- },
"Web/API/Touch_events/Using_Touch_Events": {
"modified": "2019-03-23T22:09:03.982Z",
"contributors": [
@@ -47197,6 +47190,13 @@
"AlexChao"
]
},
+ "conflicting/Web/API/Pointer_events": {
+ "modified": "2019-08-24T04:59:47.192Z",
+ "contributors": [
+ "ouxuwen",
+ "meteorlxy"
+ ]
+ },
"conflicting/Web/API/Push_API": {
"modified": "2019-03-23T22:26:22.995Z",
"contributors": [
diff --git a/files/zh-cn/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html b/files/zh-cn/conflicting/web/api/pointer_events/index.html
index 99f5ee55f7..7b579d5250 100644
--- a/files/zh-cn/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html
+++ b/files/zh-cn/conflicting/web/api/pointer_events/index.html
@@ -1,7 +1,8 @@
---
title: 同时支持触屏事件和鼠标事件
-slug: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
+slug: conflicting/Web/API/Pointer_events
translation_of: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
+original_slug: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
---
<p>{{DefaultAPISidebar("Touch Events")}}</p>