aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
Diffstat (limited to 'files')
-rw-r--r--files/ja/_redirects.txt7
-rw-r--r--files/ja/_wikihistory.json26
-rw-r--r--files/ja/conflicting/web/api/broadcastchannel/message_event/index.html (renamed from files/ja/web/api/broadcastchannel/onmessage/index.html)3
-rw-r--r--files/ja/conflicting/web/api/broadcastchannel/messageerror_event/index.html (renamed from files/ja/web/api/broadcastchannel/onmessageerror/index.html)3
-rw-r--r--files/ja/web/api/audioscheduledsourcenode/ended_event/index.html (renamed from files/ja/web/api/audioscheduledsourcenode/onended/index.html)4
-rw-r--r--files/zh-cn/_redirects.txt2
-rw-r--r--files/zh-cn/_wikihistory.json24
-rw-r--r--files/zh-cn/conflicting/web/api/broadcastchannel/message_event/index.html (renamed from files/zh-cn/web/api/broadcastchannel/onmessage/index.html)3
-rw-r--r--files/zh-cn/conflicting/web/api/broadcastchannel/messageerror_event/index.html (renamed from files/zh-cn/web/api/broadcastchannel/onmessageerror/index.html)3
9 files changed, 42 insertions, 33 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 60bd7befc2..7d5ab93c60 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3017,8 +3017,8 @@
/ja/docs/Web/API/AbstractWorker/onerror /ja/docs/Web/API/Worker/onerror
/ja/docs/Web/API/Apps.mgmt.addEventListener /ja/docs/Web/API/EventTarget/addEventListener
/ja/docs/Web/API/Apps.mgmt.removeEventListener /ja/docs/Web/API/EventTarget/removeEventListener
-/ja/docs/Web/API/AudioBufferSourceNode.onended /ja/docs/Web/API/AudioScheduledSourceNode/onended
-/ja/docs/Web/API/AudioBufferSourceNode/onended /ja/docs/Web/API/AudioScheduledSourceNode/onended
+/ja/docs/Web/API/AudioBufferSourceNode.onended /ja/docs/Web/API/AudioScheduledSourceNode/ended_event
+/ja/docs/Web/API/AudioBufferSourceNode/onended /ja/docs/Web/API/AudioScheduledSourceNode/ended_event
/ja/docs/Web/API/AudioBufferSourceNode/stop /ja/docs/Web/API/AudioScheduledSourceNode/stop
/ja/docs/Web/API/AudioContext.createScriptProcessor /ja/docs/Web/API/BaseAudioContext/createScriptProcessor
/ja/docs/Web/API/AudioContext/createAnalyser /ja/docs/Web/API/BaseAudioContext/createAnalyser
@@ -3043,7 +3043,10 @@
/ja/docs/Web/API/AudioContext/onstatechange /ja/docs/Web/API/BaseAudioContext/onstatechange
/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/AudioScheduledSourceNode/onended /ja/docs/Web/API/AudioScheduledSourceNode/ended_event
/ja/docs/Web/API/Boolean /ja/docs/Web/JavaScript/Reference/Global_Objects/Boolean
+/ja/docs/Web/API/BroadcastChannel/onmessage /ja/docs/conflicting/Web/API/BroadcastChannel/message_event
+/ja/docs/Web/API/BroadcastChannel/onmessageerror /ja/docs/conflicting/Web/API/BroadcastChannel/messageerror_event
/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
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index ea6f701c76..67a3e79324 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -10200,7 +10200,7 @@
"gooshima"
]
},
- "Web/API/AudioScheduledSourceNode/onended": {
+ "Web/API/AudioScheduledSourceNode/ended_event": {
"modified": "2019-03-23T23:09:21.353Z",
"contributors": [
"maruhiro",
@@ -10616,18 +10616,6 @@
"Wind1808"
]
},
- "Web/API/BroadcastChannel/onmessage": {
- "modified": "2020-10-15T22:19:53.795Z",
- "contributors": [
- "Wind1808"
- ]
- },
- "Web/API/BroadcastChannel/onmessageerror": {
- "modified": "2020-10-15T22:19:54.709Z",
- "contributors": [
- "Wind1808"
- ]
- },
"Web/API/BroadcastChannel/postMessage": {
"modified": "2020-10-15T22:19:54.662Z",
"contributors": [
@@ -48365,6 +48353,18 @@
"ethertank"
]
},
+ "conflicting/Web/API/BroadcastChannel/message_event": {
+ "modified": "2020-10-15T22:19:53.795Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
+ "conflicting/Web/API/BroadcastChannel/messageerror_event": {
+ "modified": "2020-10-15T22:19:54.709Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
"conflicting/Web/API/CredentialsContainer/create": {
"modified": "2020-10-15T22:26:49.264Z",
"contributors": [
diff --git a/files/ja/web/api/broadcastchannel/onmessage/index.html b/files/ja/conflicting/web/api/broadcastchannel/message_event/index.html
index 6621ea88e2..7a13d720bb 100644
--- a/files/ja/web/api/broadcastchannel/onmessage/index.html
+++ b/files/ja/conflicting/web/api/broadcastchannel/message_event/index.html
@@ -1,6 +1,6 @@
---
title: BroadcastChannel.onmessage
-slug: Web/API/BroadcastChannel/onmessage
+slug: conflicting/Web/API/BroadcastChannel/message_event
tags:
- API
- Broadcast Channel API
@@ -11,6 +11,7 @@ tags:
- Property
- Reference
translation_of: Web/API/BroadcastChannel/onmessage
+original_slug: Web/API/BroadcastChannel/onmessage
---
<p>{{APIRef("BroadCastChannel API")}}</p>
diff --git a/files/ja/web/api/broadcastchannel/onmessageerror/index.html b/files/ja/conflicting/web/api/broadcastchannel/messageerror_event/index.html
index c1e8828871..924a835960 100644
--- a/files/ja/web/api/broadcastchannel/onmessageerror/index.html
+++ b/files/ja/conflicting/web/api/broadcastchannel/messageerror_event/index.html
@@ -1,6 +1,6 @@
---
title: BroadcastChannel.onmessageerror
-slug: Web/API/BroadcastChannel/onmessageerror
+slug: conflicting/Web/API/BroadcastChannel/messageerror_event
tags:
- API
- BroadcastChannel
@@ -9,6 +9,7 @@ tags:
- Reference
- onmessageerror
translation_of: Web/API/BroadcastChannel/onmessageerror
+original_slug: Web/API/BroadcastChannel/onmessageerror
---
<div>{{APIRef("HTML DOM")}}</div>
diff --git a/files/ja/web/api/audioscheduledsourcenode/onended/index.html b/files/ja/web/api/audioscheduledsourcenode/ended_event/index.html
index 9584cc2f12..49e0de5ab6 100644
--- a/files/ja/web/api/audioscheduledsourcenode/onended/index.html
+++ b/files/ja/web/api/audioscheduledsourcenode/ended_event/index.html
@@ -1,9 +1,9 @@
---
title: AudioBufferSourceNode.onended
-slug: Web/API/AudioScheduledSourceNode/onended
+slug: Web/API/AudioScheduledSourceNode/ended_event
translation_of: Web/API/AudioScheduledSourceNode/onended
translation_of_original: Web/API/AudioBufferSourceNode/onended
-original_slug: Web/API/AudioBufferSourceNode/onended
+original_slug: Web/API/AudioScheduledSourceNode/onended
---
<p>{{ APIRef("AudioBufferSourceNode") }}</p>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index b1214b6ed1..b348f3966c 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1240,6 +1240,8 @@
/zh-CN/docs/Web/API/Blob.size /zh-CN/docs/Web/API/Blob/size
/zh-CN/docs/Web/API/Blob.slice /zh-CN/docs/Web/API/Blob/slice
/zh-CN/docs/Web/API/Blob.type /zh-CN/docs/Web/API/Blob/type
+/zh-CN/docs/Web/API/BroadcastChannel/onmessage /zh-CN/docs/conflicting/Web/API/BroadcastChannel/message_event
+/zh-CN/docs/Web/API/BroadcastChannel/onmessageerror /zh-CN/docs/conflicting/Web/API/BroadcastChannel/messageerror_event
/zh-CN/docs/Web/API/ByteString /zh-CN/docs/conflicting/Web/JavaScript/Reference/Global_Objects/String
/zh-CN/docs/Web/API/CSSStyleSheet.insertRule /zh-CN/docs/Web/API/CSSStyleSheet/insertRule
/zh-CN/docs/Web/API/CSS分页规则 /zh-CN/docs/Web/API/CSSPageRule
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 6de70e3d52..5a3f634ea5 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -8217,18 +8217,6 @@
"Spikef"
]
},
- "Web/API/BroadcastChannel/onmessage": {
- "modified": "2020-10-15T22:26:22.393Z",
- "contributors": [
- "Spikef"
- ]
- },
- "Web/API/BroadcastChannel/onmessageerror": {
- "modified": "2020-10-15T22:26:22.343Z",
- "contributors": [
- "Spikef"
- ]
- },
"Web/API/BroadcastChannel/postMessage": {
"modified": "2020-10-15T22:26:23.239Z",
"contributors": [
@@ -46795,6 +46783,18 @@
"levo2165"
]
},
+ "conflicting/Web/API/BroadcastChannel/message_event": {
+ "modified": "2020-10-15T22:26:22.393Z",
+ "contributors": [
+ "Spikef"
+ ]
+ },
+ "conflicting/Web/API/BroadcastChannel/messageerror_event": {
+ "modified": "2020-10-15T22:26:22.343Z",
+ "contributors": [
+ "Spikef"
+ ]
+ },
"conflicting/Web/API/Canvas_API/Tutorial": {
"modified": "2019-03-23T23:20:14.159Z",
"contributors": [
diff --git a/files/zh-cn/web/api/broadcastchannel/onmessage/index.html b/files/zh-cn/conflicting/web/api/broadcastchannel/message_event/index.html
index ffea7d9825..c5475fd880 100644
--- a/files/zh-cn/web/api/broadcastchannel/onmessage/index.html
+++ b/files/zh-cn/conflicting/web/api/broadcastchannel/message_event/index.html
@@ -1,7 +1,8 @@
---
title: BroadcastChannel.onmessage
-slug: Web/API/BroadcastChannel/onmessage
+slug: conflicting/Web/API/BroadcastChannel/message_event
translation_of: Web/API/BroadcastChannel/onmessage
+original_slug: Web/API/BroadcastChannel/onmessage
---
<p>{{APIRef("BroadCastChannel API")}}</p>
diff --git a/files/zh-cn/web/api/broadcastchannel/onmessageerror/index.html b/files/zh-cn/conflicting/web/api/broadcastchannel/messageerror_event/index.html
index 01c0e9ca2a..a87c54522e 100644
--- a/files/zh-cn/web/api/broadcastchannel/onmessageerror/index.html
+++ b/files/zh-cn/conflicting/web/api/broadcastchannel/messageerror_event/index.html
@@ -1,7 +1,8 @@
---
title: BroadcastChannel.onmessageerror
-slug: Web/API/BroadcastChannel/onmessageerror
+slug: conflicting/Web/API/BroadcastChannel/messageerror_event
translation_of: Web/API/BroadcastChannel/onmessageerror
+original_slug: Web/API/BroadcastChannel/onmessageerror
---
<div>{{APIRef("HTML DOM")}}</div>