aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/fr/_redirects.txt3
-rw-r--r--files/fr/_wikihistory.json12
-rw-r--r--files/fr/conflicting/web/api/pointer_events/index.md (renamed from files/fr/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.md)5
-rw-r--r--files/ja/_redirects.txt3
-rw-r--r--files/ja/_wikihistory.json14
-rw-r--r--files/ja/conflicting/web/api/pointer_events/index.html (renamed from files/ja/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html)3
-rw-r--r--files/ru/_redirects.txt1
-rw-r--r--files/ru/_wikihistory.json12
-rw-r--r--files/ru/conflicting/web/api/pointer_events/index.html (renamed from files/ru/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html)3
-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
12 files changed, 40 insertions, 34 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index 378d7d0b92..4f52dc802f 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -3723,6 +3723,7 @@
/fr/docs/Web/API/ServiceWorkerState /fr/docs/orphaned/Web/API/ServiceWorkerState
/fr/docs/Web/API/Storage/LocalStorage /fr/docs/conflicting/Web/API/Window/localStorage
/fr/docs/Web/API/StorageEstimate /fr/docs/conflicting/Web/API/StorageManager/estimate
+/fr/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /fr/docs/conflicting/Web/API/Pointer_events
/fr/docs/Web/API/ULongRange /fr/docs/conflicting/Web/API/MediaTrackConstraints
/fr/docs/Web/API/URL.createObjectURL /fr/docs/Web/API/URL/createObjectURL
/fr/docs/Web/API/URLUtilsReadOnly /fr/docs/orphaned/Web/API/URLUtilsReadOnly
@@ -4356,7 +4357,7 @@
/fr/docs/Web/Guide/DOM/Events/Creating_and_triggering_events /fr/docs/orphaned/Web/Guide/Events/Creating_and_triggering_events
/fr/docs/Web/Guide/DOM/Events/Les_données_d_orientation_et_de_mouvement_expliquées /fr/docs/orphaned/Web/Guide/Events/Orientation_and_motion_data_explained
/fr/docs/Web/Guide/DOM/Events/Touch_events /fr/docs/Web/API/Touch_events
-/fr/docs/Web/Guide/DOM/Events/Touch_events/Gérer_à_la_fois_événement_tactile_et_événement_de_la_souris /fr/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
+/fr/docs/Web/Guide/DOM/Events/Touch_events/Gérer_à_la_fois_événement_tactile_et_événement_de_la_souris /fr/docs/conflicting/Web/API/Pointer_events
/fr/docs/Web/Guide/DOM/Manipuler l'historique du navigateur /fr/docs/Web/API/History_API
/fr/docs/Web/Guide/DOM/Manipuler l'historique du navigateur/Example /fr/docs/Web/API/History_API/Example
/fr/docs/Web/Guide/DOM/Manipuler_historique_du_navigateur /fr/docs/Web/API/History_API
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index e3685c3a97..14fc7b1eff 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -19566,12 +19566,6 @@
"SphinxKnight"
]
},
- "Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent": {
- "modified": "2019-03-18T21:33:21.001Z",
- "contributors": [
- "CharlotteW"
- ]
- },
"Web/API/Transferable": {
"modified": "2020-10-15T21:33:28.712Z",
"contributors": [
@@ -43069,6 +43063,12 @@
"SphinxKnight"
]
},
+ "conflicting/Web/API/Pointer_events": {
+ "modified": "2019-03-18T21:33:21.001Z",
+ "contributors": [
+ "CharlotteW"
+ ]
+ },
"conflicting/Web/API/Selection": {
"modified": "2019-03-18T21:28:44.424Z",
"contributors": [
diff --git a/files/fr/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.md b/files/fr/conflicting/web/api/pointer_events/index.md
index d3ab597400..a29e9affce 100644
--- a/files/fr/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.md
+++ b/files/fr/conflicting/web/api/pointer_events/index.md
@@ -1,9 +1,8 @@
---
title: Gérer à la fois événement tactile et événement de la souris
-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/Guide/DOM/Events/Touch_events/Gérer_à_la_fois_événement_tactile_et_événement_de_la_souris
+original_slug: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
---
{{DefaultAPISidebar("Touch Events")}}
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index e2374896d4..40ffd7a36e 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3257,6 +3257,7 @@
/ja/docs/Web/API/StorageEstimate/quota /ja/docs/conflicting/Web/API/StorageManager/estimate_78aa4ffd4dfacc8f94d5c05d150d36ac
/ja/docs/Web/API/StorageEstimate/usage /ja/docs/conflicting/Web/API/StorageManager/estimate_9ffeea37c30a26922d3f1621912db8d8
/ja/docs/Web/API/TouchList.length /ja/docs/Web/API/TouchList/length
+/ja/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /ja/docs/conflicting/Web/API/Pointer_events
/ja/docs/Web/API/UserProximityEvent.near /ja/docs/Web/API/UserProximityEvent
/ja/docs/Web/API/UserProximityEvent/near /ja/docs/Web/API/UserProximityEvent
/ja/docs/Web/API/VRDevice /ja/docs/Web/API/VRDisplay
@@ -3913,7 +3914,7 @@
/ja/docs/Web/Guide/CSS/Using_multiple_backgrounds /ja/docs/Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds
/ja/docs/Web/Guide/DOM /ja/docs/Web/API/Document_Object_Model
/ja/docs/Web/Guide/DOM/Events/Touch_events /ja/docs/Web/API/Touch_events
-/ja/docs/Web/Guide/DOM/Events/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /ja/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
+/ja/docs/Web/Guide/DOM/Events/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /ja/docs/conflicting/Web/API/Pointer_events
/ja/docs/Web/Guide/DOM/Manipulating_the_browser_history /ja/docs/Web/API/History_API
/ja/docs/Web/Guide/DOM/Manipulating_the_browser_history/Example /ja/docs/Web/API/History_API/Example
/ja/docs/Web/Guide/DOM/Manipulating_the_browser_history/Working_with_the_History_API /ja/docs/Web/API/History_API/Working_with_the_History_API
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 13890f904e..b55beced95 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -22513,13 +22513,6 @@
"Potappo"
]
},
- "Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent": {
- "modified": "2019-03-18T20:45:32.564Z",
- "contributors": [
- "mfuji09",
- "YuichiNukiyama"
- ]
- },
"Web/API/TrackEvent": {
"modified": "2020-10-15T22:19:11.950Z",
"contributors": [
@@ -48509,6 +48502,13 @@
"e53e04ac"
]
},
+ "conflicting/Web/API/Pointer_events": {
+ "modified": "2019-03-18T20:45:32.564Z",
+ "contributors": [
+ "mfuji09",
+ "YuichiNukiyama"
+ ]
+ },
"conflicting/Web/API/StorageManager/estimate": {
"modified": "2020-10-15T22:20:05.823Z",
"contributors": [
diff --git a/files/ja/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html b/files/ja/conflicting/web/api/pointer_events/index.html
index c6a359ea78..e3c50c41ac 100644
--- a/files/ja/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html
+++ b/files/ja/conflicting/web/api/pointer_events/index.html
@@ -1,11 +1,12 @@
---
title: TouchEvent と MouseEvent の両方をサポートする
-slug: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
+slug: conflicting/Web/API/Pointer_events
tags:
- Guide
- TouchEvent
- touch
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>
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index b6ded722e2..f32afa34e2 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -364,6 +364,7 @@
/ru/docs/Web/API/PositionError /ru/docs/Web/API/GeolocationPositionError
/ru/docs/Web/API/PositionOptions /ru/docs/conflicting/Web/API/Geolocation/getCurrentPosition
/ru/docs/Web/API/RandomSource/getRandomValues /ru/docs/Web/API/Crypto/getRandomValues
+/ru/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /ru/docs/conflicting/Web/API/Pointer_events
/ru/docs/Web/API/USB/onconnect /ru/docs/Web/API/USB/connect_event
/ru/docs/Web/API/USB/ondisconnect /ru/docs/Web/API/USB/disconnect_event
/ru/docs/Web/API/WebGL_API/Adding_2D_content_to_a_WebGL_context /ru/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index 1e6f4922fc..7a042b1535 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -10477,12 +10477,6 @@
"surrsoft"
]
},
- "Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent": {
- "modified": "2020-08-27T17:02:59.997Z",
- "contributors": [
- "hisbvdis"
- ]
- },
"Web/API/Touch_events/Using_Touch_Events": {
"modified": "2020-09-03T17:23:38.278Z",
"contributors": [
@@ -24197,6 +24191,12 @@
"AlexAlex"
]
},
+ "conflicting/Web/API/Pointer_events": {
+ "modified": "2020-08-27T17:02:59.997Z",
+ "contributors": [
+ "hisbvdis"
+ ]
+ },
"conflicting/Web/API/Push_API": {
"modified": "2019-03-23T22:33:26.535Z",
"contributors": [
diff --git a/files/ru/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html b/files/ru/conflicting/web/api/pointer_events/index.html
index d9f05fdec0..6752043059 100644
--- a/files/ru/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html
+++ b/files/ru/conflicting/web/api/pointer_events/index.html
@@ -1,7 +1,8 @@
---
title: Поддержка TouchEvent и MouseEvent
-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>
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>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-30 22:31:29 +0000