aboutsummaryrefslogtreecommitdiff
path: root/files/ja
diff options
context:
space:
mode:
Diffstat (limited to 'files/ja')
-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
3 files changed, 11 insertions, 9 deletions
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>