aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn
diff options
context:
space:
mode:
Diffstat (limited to 'files/zh-cn')
-rw-r--r--files/zh-cn/_redirects.txt8
-rw-r--r--files/zh-cn/_wikihistory.json28
-rw-r--r--files/zh-cn/conflicting/web/api/mouseevent/pagex/index.html (renamed from files/zh-cn/web/api/uievent/pagex/index.html)3
-rw-r--r--files/zh-cn/conflicting/web/api/mouseevent/pagey/index.html (renamed from files/zh-cn/web/api/uievent/pagey/index.html)3
4 files changed, 23 insertions, 19 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index f89f0c699c..3e3a29ee8d 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -412,7 +412,7 @@
/zh-CN/docs/DOM/event.defaultPrevented /zh-CN/docs/Web/API/Event/defaultPrevented
/zh-CN/docs/DOM/event.isChar /zh-CN/docs/Web/API/UIEvent/isChar
/zh-CN/docs/DOM/event.isTrusted /zh-CN/docs/Web/API/Event/isTrusted
-/zh-CN/docs/DOM/event.pageY /zh-CN/docs/Web/API/UIEvent/pageY
+/zh-CN/docs/DOM/event.pageY /zh-CN/docs/conflicting/Web/API/MouseEvent/pageY
/zh-CN/docs/DOM/event.preventDefault /zh-CN/docs/Web/API/Event/preventDefault
/zh-CN/docs/DOM/event.stopImmediatePropagation /zh-CN/docs/Web/API/Event/stopImmediatePropagation
/zh-CN/docs/DOM/event.stopPropagation /zh-CN/docs/Web/API/Event/stopPropagation
@@ -1309,7 +1309,7 @@
/zh-CN/docs/Web/API/Element/removeAttributre /zh-CN/docs/Web/API/Element/removeAttribute
/zh-CN/docs/Web/API/Event/CustomEvent /zh-CN/docs/Web/API/CustomEvent
/zh-CN/docs/Web/API/Event/isChar /zh-CN/docs/Web/API/UIEvent/isChar
-/zh-CN/docs/Web/API/Event/pageY /zh-CN/docs/Web/API/UIEvent/pageY
+/zh-CN/docs/Web/API/Event/pageY /zh-CN/docs/conflicting/Web/API/MouseEvent/pageY
/zh-CN/docs/Web/API/Event/禁用时间冒泡 /zh-CN/docs/Web/API/Event/cancelBubble
/zh-CN/docs/Web/API/EventTarget.dispatchEvent /zh-CN/docs/Web/API/EventTarget/dispatchEvent
/zh-CN/docs/Web/API/EventTarget.removeEventListener /zh-CN/docs/Web/API/EventTarget/removeEventListener
@@ -1476,6 +1476,8 @@
/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/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
/zh-CN/docs/Web/API/URL.URL /zh-CN/docs/Web/API/URL/URL
/zh-CN/docs/Web/API/URL.createObjectURL /zh-CN/docs/Web/API/URL/createObjectURL
@@ -1629,7 +1631,7 @@
/zh-CN/docs/Web/API/event.defaultPrevented /zh-CN/docs/Web/API/Event/defaultPrevented
/zh-CN/docs/Web/API/event.isChar /zh-CN/docs/Web/API/UIEvent/isChar
/zh-CN/docs/Web/API/event.isTrusted /zh-CN/docs/Web/API/Event/isTrusted
-/zh-CN/docs/Web/API/event.pageY /zh-CN/docs/Web/API/UIEvent/pageY
+/zh-CN/docs/Web/API/event.pageY /zh-CN/docs/conflicting/Web/API/MouseEvent/pageY
/zh-CN/docs/Web/API/event.preventDefault /zh-CN/docs/Web/API/Event/preventDefault
/zh-CN/docs/Web/API/event.stopImmediatePropagation /zh-CN/docs/Web/API/Event/stopImmediatePropagation
/zh-CN/docs/Web/API/event.stopPropagation /zh-CN/docs/Web/API/Event/stopPropagation
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 5b8e48f2d8..fe36d86467 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -20815,20 +20815,6 @@
"jsx"
]
},
- "Web/API/UIEvent/pageX": {
- "modified": "2019-03-23T22:51:51.935Z",
- "contributors": [
- "Tienyz"
- ]
- },
- "Web/API/UIEvent/pageY": {
- "modified": "2019-03-24T00:16:10.292Z",
- "contributors": [
- "ziyunfei",
- "teoli",
- "khalid32"
- ]
- },
"Web/API/UIEvent/view": {
"modified": "2020-10-15T22:25:09.871Z",
"contributors": [
@@ -47261,6 +47247,20 @@
"AshfaqHossain"
]
},
+ "conflicting/Web/API/MouseEvent/pageX": {
+ "modified": "2019-03-23T22:51:51.935Z",
+ "contributors": [
+ "Tienyz"
+ ]
+ },
+ "conflicting/Web/API/MouseEvent/pageY": {
+ "modified": "2019-03-24T00:16:10.292Z",
+ "contributors": [
+ "ziyunfei",
+ "teoli",
+ "khalid32"
+ ]
+ },
"conflicting/Web/API/MouseEvent/relatedTarget": {
"modified": "2019-03-23T23:09:12.340Z",
"contributors": [
diff --git a/files/zh-cn/web/api/uievent/pagex/index.html b/files/zh-cn/conflicting/web/api/mouseevent/pagex/index.html
index b4a7f812f7..7089c102a8 100644
--- a/files/zh-cn/web/api/uievent/pagex/index.html
+++ b/files/zh-cn/conflicting/web/api/mouseevent/pagex/index.html
@@ -1,7 +1,8 @@
---
title: UIEvent.pageX
-slug: Web/API/UIEvent/pageX
+slug: conflicting/Web/API/MouseEvent/pageX
translation_of: Web/API/UIEvent/pageX
+original_slug: Web/API/UIEvent/pageX
---
<p>{{APIRef("DOM Events")}} {{Non-standard_header}}</p>
diff --git a/files/zh-cn/web/api/uievent/pagey/index.html b/files/zh-cn/conflicting/web/api/mouseevent/pagey/index.html
index 6c504d3f52..f4c92daa4e 100644
--- a/files/zh-cn/web/api/uievent/pagey/index.html
+++ b/files/zh-cn/conflicting/web/api/mouseevent/pagey/index.html
@@ -1,7 +1,8 @@
---
title: event.pageY
-slug: Web/API/UIEvent/pageY
+slug: conflicting/Web/API/MouseEvent/pageY
translation_of: Web/API/UIEvent/pageY
+original_slug: Web/API/UIEvent/pageY
---
<p>{{ ApiRef() }}</p>
<h3 id="Summary" name="Summary">概述</h3>