aboutsummaryrefslogtreecommitdiff
path: root/files/ja
diff options
context:
space:
mode:
Diffstat (limited to 'files/ja')
-rw-r--r--files/ja/_redirects.txt2
-rw-r--r--files/ja/_wikihistory.json24
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/string/index.html (renamed from files/ja/web/api/bytestring/index.html)3
-rw-r--r--files/ja/web/api/uievent/which/index.html (renamed from files/ja/web/api/mouseevent/which/index.html)3
4 files changed, 18 insertions, 14 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 8014f04141..8fd044c2be 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3045,6 +3045,7 @@
/ja/docs/Web/API/AudioContext/sampleRate /ja/docs/Web/API/BaseAudioContext/sampleRate
/ja/docs/Web/API/AudioContext/state /ja/docs/Web/API/BaseAudioContext/state
/ja/docs/Web/API/Boolean /ja/docs/Web/JavaScript/Reference/Global_Objects/Boolean
+/ja/docs/Web/API/ByteString /ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/String
/ja/docs/Web/API/CSSMatrix /ja/docs/Web/API/DOMMatrix
/ja/docs/Web/API/CSSStyleSheet.insertRule /ja/docs/Web/API/CSSStyleSheet/insertRule
/ja/docs/Web/API/CSS_Painting_API/ガイド /ja/docs/Web/API/CSS_Painting_API/Guide
@@ -3161,6 +3162,7 @@
/ja/docs/Web/API/Index /ja/docs/conflicting/Web/API_49b9a84475f11fffb8fc271a7df3c49a
/ja/docs/Web/API/IndexedDB_API/Basic_Concepts_Behind_IndexedDB /ja/docs/Web/API/IndexedDB_API/Basic_Terminology
/ja/docs/Web/API/MediaRecorder_API /ja/docs/Web/API/MediaStream_Recording_API
+/ja/docs/Web/API/MouseEvent/which /ja/docs/Web/API/UIEvent/which
/ja/docs/Web/API/Navigator.getUserMedia /ja/docs/Web/API/Navigator/getUserMedia
/ja/docs/Web/API/Navigator/registerContentHandler /ja/docs/orphaned/Web/API/Navigator/registerContentHandler
/ja/docs/Web/API/NavigatorID /ja/docs/Web/API/Navigator
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index db3e031f5d..d59a68f7be 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -10699,12 +10699,6 @@
"Wind1808"
]
},
- "Web/API/ByteString": {
- "modified": "2020-03-11T12:49:49.193Z",
- "contributors": [
- "mfuji09"
- ]
- },
"Web/API/CDATASection": {
"modified": "2019-09-16T12:26:56.983Z",
"contributors": [
@@ -18756,12 +18750,6 @@
"naturallucky"
]
},
- "Web/API/MouseEvent/which": {
- "modified": "2020-10-15T22:18:18.557Z",
- "contributors": [
- "isdh"
- ]
- },
"Web/API/MutationObserver": {
"modified": "2020-10-15T21:21:02.785Z",
"contributors": [
@@ -22682,6 +22670,12 @@
"yyss"
]
},
+ "Web/API/UIEvent/which": {
+ "modified": "2020-10-15T22:18:18.557Z",
+ "contributors": [
+ "isdh"
+ ]
+ },
"Web/API/URL": {
"modified": "2020-10-15T21:33:06.267Z",
"contributors": [
@@ -48609,6 +48603,12 @@
"sii"
]
},
+ "conflicting/Web/JavaScript/Reference/Global_Objects/String": {
+ "modified": "2020-03-11T12:49:49.193Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
"orphaned/Building_a_Mozilla_Distribution": {
"modified": "2019-03-23T23:49:07.062Z",
"contributors": [
diff --git a/files/ja/web/api/bytestring/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/string/index.html
index b92bb846e3..904fd7d989 100644
--- a/files/ja/web/api/bytestring/index.html
+++ b/files/ja/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
- ByteString
@@ -11,6 +11,7 @@ tags:
- WebIDL
- インターフェイス
translation_of: Web/API/ByteString
+original_slug: Web/API/ByteString
---
<div>{{APIRef("DOM")}}</div>
diff --git a/files/ja/web/api/mouseevent/which/index.html b/files/ja/web/api/uievent/which/index.html
index 8334684b1e..8b9612bd82 100644
--- a/files/ja/web/api/mouseevent/which/index.html
+++ b/files/ja/web/api/uievent/which/index.html
@@ -1,6 +1,6 @@
---
title: MouseEvent.which
-slug: Web/API/MouseEvent/which
+slug: Web/API/UIEvent/which
tags:
- API
- DOM Events
@@ -10,6 +10,7 @@ tags:
- Read-only
- Reference
translation_of: Web/API/MouseEvent/which
+original_slug: Web/API/MouseEvent/which
---
<p>{{APIRef("DOM Events")}}</p>