aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
Diffstat (limited to 'files')
-rw-r--r--files/ja/_redirects.txt4
-rw-r--r--files/ja/_wikihistory.json50
-rw-r--r--files/ja/conflicting/web/api/element/fullscreenchange_event/index.html (renamed from files/ja/web/api/element/onfullscreenchange/index.html)3
-rw-r--r--files/ja/conflicting/web/api/element/fullscreenerror_event/index.html (renamed from files/ja/web/api/element/onfullscreenerror/index.html)3
-rw-r--r--files/ja/conflicting/web/api/window/gamepadconnected_event/index.html (renamed from files/ja/web/api/window/ongamepadconnected/index.html)3
-rw-r--r--files/ja/conflicting/web/api/window/gamepaddisconnected_event/index.html (renamed from files/ja/web/api/window/ongamepaddisconnected/index.html)3
-rw-r--r--files/ru/_redirects.txt2
-rw-r--r--files/ru/_wikihistory.json24
-rw-r--r--files/ru/conflicting/web/api/window/gamepadconnected_event/index.html (renamed from files/ru/web/api/window/ongamepadconnected/index.html)3
-rw-r--r--files/ru/conflicting/web/api/window/gamepaddisconnected_event/index.html (renamed from files/ru/web/api/window/ongamepaddisconnected/index.html)3
-rw-r--r--files/zh-cn/_redirects.txt4
-rw-r--r--files/zh-cn/_wikihistory.json50
-rw-r--r--files/zh-cn/conflicting/web/api/window/gamepadconnected_event/index.html (renamed from files/zh-cn/web/api/window/ongamepadconnected/index.html)3
-rw-r--r--files/zh-cn/web/api/element/fullscreenchange_event/index.html (renamed from files/zh-cn/web/api/element/onfullscreenchange/index.html)3
-rw-r--r--files/zh-cn/web/api/element/fullscreenerror_event/index.html (renamed from files/zh-cn/web/api/element/onfullscreenerror/index.html)3
-rw-r--r--files/zh-cn/web/api/window/gamepaddisconnected_event/index.html (renamed from files/zh-cn/web/api/window/ongamepaddisconnected/index.html)3
16 files changed, 92 insertions, 72 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index bd6257cb70..60bd7befc2 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3083,6 +3083,8 @@
/ja/docs/Web/API/Element/Activate_event /ja/docs/Web/API/Element/DOMActivate_event
/ja/docs/Web/API/Element/accessKey /ja/docs/Web/API/HTMLElement/accessKey
/ja/docs/Web/API/Element/name /ja/docs/Web/API
+/ja/docs/Web/API/Element/onfullscreenchange /ja/docs/conflicting/Web/API/Element/fullscreenchange_event
+/ja/docs/Web/API/Element/onfullscreenerror /ja/docs/conflicting/Web/API/Element/fullscreenerror_event
/ja/docs/Web/API/Event/button /ja/docs/Web/API/MouseEvent/button
/ja/docs/Web/API/Event/createEvent /ja/docs/Web/API/Document/createEvent
/ja/docs/Web/API/EventHandler /ja/docs/Web/Events/Event_handlers
@@ -3328,6 +3330,8 @@
/ja/docs/Web/API/Window/onclick /ja/docs/Web/API/GlobalEventHandlers/onclick
/ja/docs/Web/API/Window/ondeviceproximity /ja/docs/orphaned/Web/API/Window/ondeviceproximity
/ja/docs/Web/API/Window/onfocus /ja/docs/Web/API/GlobalEventHandlers/onfocus
+/ja/docs/Web/API/Window/ongamepadconnected /ja/docs/conflicting/Web/API/Window/gamepadconnected_event
+/ja/docs/Web/API/Window/ongamepaddisconnected /ja/docs/conflicting/Web/API/Window/gamepaddisconnected_event
/ja/docs/Web/API/Window/oninstall /ja/docs/Web/API/Window/onappinstalled
/ja/docs/Web/API/Window/onkeydown /ja/docs/Web/API/GlobalEventHandlers/onkeydown
/ja/docs/Web/API/Window/onkeyup /ja/docs/Web/API/GlobalEventHandlers/onkeyup
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index f8b4b6cbc4..ea6f701c76 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -14020,18 +14020,6 @@
"Taken"
]
},
- "Web/API/Element/onfullscreenchange": {
- "modified": "2020-10-15T22:27:05.186Z",
- "contributors": [
- "mfuji09"
- ]
- },
- "Web/API/Element/onfullscreenerror": {
- "modified": "2020-10-15T22:27:05.707Z",
- "contributors": [
- "mfuji09"
- ]
- },
"Web/API/Element/outerHTML": {
"modified": "2020-10-15T21:49:26.268Z",
"contributors": [
@@ -24511,19 +24499,6 @@
"mfuji09"
]
},
- "Web/API/Window/ongamepadconnected": {
- "modified": "2020-10-15T22:12:53.034Z",
- "contributors": [
- "T.Ukegawa"
- ]
- },
- "Web/API/Window/ongamepaddisconnected": {
- "modified": "2020-10-15T22:12:51.410Z",
- "contributors": [
- "Potappo",
- "T.Ukegawa"
- ]
- },
"Web/API/Window/open": {
"modified": "2020-10-25T23:26:28.860Z",
"contributors": [
@@ -48416,6 +48391,18 @@
"yyss"
]
},
+ "conflicting/Web/API/Element/fullscreenchange_event": {
+ "modified": "2020-10-15T22:27:05.186Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
+ "conflicting/Web/API/Element/fullscreenerror_event": {
+ "modified": "2020-10-15T22:27:05.707Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
"conflicting/Web/API/File/name": {
"modified": "2020-09-25T16:45:23.436Z",
"contributors": [
@@ -48517,6 +48504,19 @@
"mfuji09"
]
},
+ "conflicting/Web/API/Window/gamepadconnected_event": {
+ "modified": "2020-10-15T22:12:53.034Z",
+ "contributors": [
+ "T.Ukegawa"
+ ]
+ },
+ "conflicting/Web/API/Window/gamepaddisconnected_event": {
+ "modified": "2020-10-15T22:12:51.410Z",
+ "contributors": [
+ "Potappo",
+ "T.Ukegawa"
+ ]
+ },
"conflicting/Web/API/Window/scroll": {
"modified": "2020-10-15T22:32:16.096Z",
"contributors": [
diff --git a/files/ja/web/api/element/onfullscreenchange/index.html b/files/ja/conflicting/web/api/element/fullscreenchange_event/index.html
index f58e332afb..72f03279ee 100644
--- a/files/ja/web/api/element/onfullscreenchange/index.html
+++ b/files/ja/conflicting/web/api/element/fullscreenchange_event/index.html
@@ -1,6 +1,6 @@
---
title: Element.onfullscreenchange
-slug: Web/API/Element/onfullscreenchange
+slug: conflicting/Web/API/Element/fullscreenchange_event
tags:
- API
- Element
@@ -18,6 +18,7 @@ tags:
- 全画面
- 全画面モード
translation_of: Web/API/Element/onfullscreenchange
+original_slug: Web/API/Element/onfullscreenchange
---
<div>{{ApiRef("Fullscreen API")}}</div>
diff --git a/files/ja/web/api/element/onfullscreenerror/index.html b/files/ja/conflicting/web/api/element/fullscreenerror_event/index.html
index b1a08f41c9..95cbd0764b 100644
--- a/files/ja/web/api/element/onfullscreenerror/index.html
+++ b/files/ja/conflicting/web/api/element/fullscreenerror_event/index.html
@@ -1,6 +1,6 @@
---
title: Element.onfullscreenerror
-slug: Web/API/Element/onfullscreenerror
+slug: conflicting/Web/API/Element/fullscreenerror_event
tags:
- API
- Element
@@ -15,6 +15,7 @@ tags:
- プロパティ
- 全画面モード
translation_of: Web/API/Element/onfullscreenerror
+original_slug: Web/API/Element/onfullscreenerror
---
<div>{{ApiRef("Fullscreen API")}}</div>
diff --git a/files/ja/web/api/window/ongamepadconnected/index.html b/files/ja/conflicting/web/api/window/gamepadconnected_event/index.html
index ce2246c3cd..228ecd4cba 100644
--- a/files/ja/web/api/window/ongamepadconnected/index.html
+++ b/files/ja/conflicting/web/api/window/gamepadconnected_event/index.html
@@ -1,6 +1,6 @@
---
title: Window.ongamepadconnected
-slug: Web/API/Window/ongamepadconnected
+slug: conflicting/Web/API/Window/gamepadconnected_event
tags:
- API
- Event Handler
@@ -11,6 +11,7 @@ tags:
- Window
- ongamepadconnected
translation_of: Web/API/Window/ongamepadconnected
+original_slug: Web/API/Window/ongamepadconnected
---
<div>
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>
diff --git a/files/ja/web/api/window/ongamepaddisconnected/index.html b/files/ja/conflicting/web/api/window/gamepaddisconnected_event/index.html
index f9b33bb033..d0a42860a0 100644
--- a/files/ja/web/api/window/ongamepaddisconnected/index.html
+++ b/files/ja/conflicting/web/api/window/gamepaddisconnected_event/index.html
@@ -1,6 +1,6 @@
---
title: Window.ongamepaddisconnected
-slug: Web/API/Window/ongamepaddisconnected
+slug: conflicting/Web/API/Window/gamepaddisconnected_event
tags:
- API
- Event Handler
@@ -11,6 +11,7 @@ tags:
- Window
- ongamepaddisconnected
translation_of: Web/API/Window/ongamepaddisconnected
+original_slug: Web/API/Window/ongamepaddisconnected
---
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index e7eb0f6a6e..2f010dde80 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -379,6 +379,8 @@
/ru/docs/Web/API/WebRTC_API/связь /ru/docs/Web/API/WebRTC_API/Connectivity
/ru/docs/Web/API/Window/crypto /ru/docs/Web/API/crypto_property
/ru/docs/Web/API/Window/mozAnimationStartTime /ru/docs/Web/API/Animation/startTime
+/ru/docs/Web/API/Window/ongamepadconnected /ru/docs/conflicting/Web/API/Window/gamepadconnected_event
+/ru/docs/Web/API/Window/ongamepaddisconnected /ru/docs/conflicting/Web/API/Window/gamepaddisconnected_event
/ru/docs/Web/API/Window/performance /ru/docs/Web/API/performance_property
/ru/docs/Web/API/WindowBase64/Base64_encoding_and_decoding /ru/docs/Glossary/Base64
/ru/docs/Web/API/WindowBase64/btoa /ru/docs/Web/API/btoa
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index fd690347f2..a46230ec2c 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -11321,18 +11321,6 @@
"timur-gilauri"
]
},
- "Web/API/Window/ongamepadconnected": {
- "modified": "2020-11-17T12:43:15.635Z",
- "contributors": [
- "venanen"
- ]
- },
- "Web/API/Window/ongamepaddisconnected": {
- "modified": "2020-11-17T12:45:18.585Z",
- "contributors": [
- "venanen"
- ]
- },
"Web/API/Window/onpaint": {
"modified": "2019-03-23T22:08:47.903Z",
"contributors": [
@@ -24241,6 +24229,18 @@
"akhabibullina"
]
},
+ "conflicting/Web/API/Window/gamepadconnected_event": {
+ "modified": "2020-11-17T12:43:15.635Z",
+ "contributors": [
+ "venanen"
+ ]
+ },
+ "conflicting/Web/API/Window/gamepaddisconnected_event": {
+ "modified": "2020-11-17T12:45:18.585Z",
+ "contributors": [
+ "venanen"
+ ]
+ },
"conflicting/Web/API/Window/localStorage": {
"modified": "2019-03-23T22:05:00.067Z",
"contributors": [
diff --git a/files/ru/web/api/window/ongamepadconnected/index.html b/files/ru/conflicting/web/api/window/gamepadconnected_event/index.html
index 758fed2d2d..f6ff1a3474 100644
--- a/files/ru/web/api/window/ongamepadconnected/index.html
+++ b/files/ru/conflicting/web/api/window/gamepadconnected_event/index.html
@@ -1,7 +1,8 @@
---
title: Window.ongamepadconnected
-slug: Web/API/Window/ongamepadconnected
+slug: conflicting/Web/API/Window/gamepadconnected_event
translation_of: Web/API/Window/ongamepadconnected
+original_slug: Web/API/Window/ongamepadconnected
---
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>
diff --git a/files/ru/web/api/window/ongamepaddisconnected/index.html b/files/ru/conflicting/web/api/window/gamepaddisconnected_event/index.html
index 26390e5430..411e9eea24 100644
--- a/files/ru/web/api/window/ongamepaddisconnected/index.html
+++ b/files/ru/conflicting/web/api/window/gamepaddisconnected_event/index.html
@@ -1,7 +1,8 @@
---
title: Window.ongamepaddisconnected
-slug: Web/API/Window/ongamepaddisconnected
+slug: conflicting/Web/API/Window/gamepaddisconnected_event
translation_of: Web/API/Window/ongamepaddisconnected
+original_slug: Web/API/Window/ongamepaddisconnected
---
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 84dfe0d381..b1214b6ed1 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1315,6 +1315,8 @@
/zh-CN/docs/Web/API/Element/onbeforescriptexecute /zh-CN/docs/Web/API/Document/onbeforescriptexecute
/zh-CN/docs/Web/API/Element/oncopy /zh-CN/docs/Web/API/HTMLElement/oncopy
/zh-CN/docs/Web/API/Element/oncut /zh-CN/docs/Web/API/HTMLElement/oncut
+/zh-CN/docs/Web/API/Element/onfullscreenchange /zh-CN/docs/Web/API/Element/fullscreenchange_event
+/zh-CN/docs/Web/API/Element/onfullscreenerror /zh-CN/docs/Web/API/Element/fullscreenerror_event
/zh-CN/docs/Web/API/Element/onpaste /zh-CN/docs/Web/API/HTMLElement/onpaste
/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
@@ -1590,6 +1592,8 @@
/zh-CN/docs/Web/API/Window/minimize /zh-CN/docs/conflicting/Web/API/Window
/zh-CN/docs/Web/API/Window/mozAnimationStartTIme /zh-CN/docs/Web/API/Animation/startTime
/zh-CN/docs/Web/API/Window/onbeforeunload /zh-CN/docs/Web/API/WindowEventHandlers/onbeforeunload
+/zh-CN/docs/Web/API/Window/ongamepadconnected /zh-CN/docs/conflicting/Web/API/Window/gamepadconnected_event
+/zh-CN/docs/Web/API/Window/ongamepaddisconnected /zh-CN/docs/Web/API/Window/gamepaddisconnected_event
/zh-CN/docs/Web/API/Window/onhashchange /zh-CN/docs/Web/API/WindowEventHandlers/onhashchange
/zh-CN/docs/Web/API/Window/onpopstate /zh-CN/docs/Web/API/WindowEventHandlers/onpopstate
/zh-CN/docs/Web/API/Window/onresize /zh-CN/docs/Web/API/GlobalEventHandlers/onresize
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 4589deb197..6de70e3d52 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -12143,6 +12143,19 @@
"liuhe"
]
},
+ "Web/API/Element/fullscreenchange_event": {
+ "modified": "2019-03-18T21:19:43.587Z",
+ "contributors": [
+ "Wyatt"
+ ]
+ },
+ "Web/API/Element/fullscreenerror_event": {
+ "modified": "2020-10-15T22:21:46.027Z",
+ "contributors": [
+ "kjyzly",
+ "LinChengDior"
+ ]
+ },
"Web/API/Element/getAttribute": {
"modified": "2019-04-29T04:23:55.908Z",
"contributors": [
@@ -12432,19 +12445,6 @@
"ziyunfei"
]
},
- "Web/API/Element/onfullscreenchange": {
- "modified": "2019-03-18T21:19:43.587Z",
- "contributors": [
- "Wyatt"
- ]
- },
- "Web/API/Element/onfullscreenerror": {
- "modified": "2020-10-15T22:21:46.027Z",
- "contributors": [
- "kjyzly",
- "LinChengDior"
- ]
- },
"Web/API/Element/openOrClosedShadowRoot": {
"modified": "2020-10-15T22:35:17.746Z",
"contributors": [
@@ -22901,6 +22901,12 @@
"libin2866"
]
},
+ "Web/API/Window/gamepaddisconnected_event": {
+ "modified": "2020-10-15T22:23:08.406Z",
+ "contributors": [
+ "AWhiteMouse"
+ ]
+ },
"Web/API/Window/getComputedStyle": {
"modified": "2020-10-15T21:29:18.864Z",
"contributors": [
@@ -23160,18 +23166,6 @@
"PengyaoZhang"
]
},
- "Web/API/Window/ongamepadconnected": {
- "modified": "2020-10-15T22:22:28.465Z",
- "contributors": [
- "VoidRain"
- ]
- },
- "Web/API/Window/ongamepaddisconnected": {
- "modified": "2020-10-15T22:23:08.406Z",
- "contributors": [
- "AWhiteMouse"
- ]
- },
"Web/API/Window/online_event": {
"modified": "2019-04-18T11:22:47.220Z",
"contributors": [
@@ -47272,6 +47266,12 @@
"ziyunfei"
]
},
+ "conflicting/Web/API/Window/gamepadconnected_event": {
+ "modified": "2020-10-15T22:22:28.465Z",
+ "contributors": [
+ "VoidRain"
+ ]
+ },
"conflicting/Web/API/Window/localStorage": {
"modified": "2019-03-23T22:25:01.381Z",
"contributors": [
diff --git a/files/zh-cn/web/api/window/ongamepadconnected/index.html b/files/zh-cn/conflicting/web/api/window/gamepadconnected_event/index.html
index 809fd1f1c7..8ec4daf1f5 100644
--- a/files/zh-cn/web/api/window/ongamepadconnected/index.html
+++ b/files/zh-cn/conflicting/web/api/window/gamepadconnected_event/index.html
@@ -1,6 +1,6 @@
---
title: Window.ongamepadconnected
-slug: Web/API/Window/ongamepadconnected
+slug: conflicting/Web/API/Window/gamepadconnected_event
tags:
- API
- Event Handler
@@ -14,6 +14,7 @@ tags:
- 手柄
- 游戏
translation_of: Web/API/Window/ongamepadconnected
+original_slug: Web/API/Window/ongamepadconnected
---
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>
diff --git a/files/zh-cn/web/api/element/onfullscreenchange/index.html b/files/zh-cn/web/api/element/fullscreenchange_event/index.html
index 2a2b2416cf..7da05dd65b 100644
--- a/files/zh-cn/web/api/element/onfullscreenchange/index.html
+++ b/files/zh-cn/web/api/element/fullscreenchange_event/index.html
@@ -1,7 +1,8 @@
---
title: Element.onfullscreenchange
-slug: Web/API/Element/onfullscreenchange
+slug: Web/API/Element/fullscreenchange_event
translation_of: Web/API/Element/onfullscreenchange
+original_slug: Web/API/Element/onfullscreenchange
---
<div>元素接口的 <code><strong>onfullscreenchange</strong></code><strong> </strong>属性是在元素过渡到或过渡到全屏模式时触发的全屏更改事件的事件处理程序。</div>
diff --git a/files/zh-cn/web/api/element/onfullscreenerror/index.html b/files/zh-cn/web/api/element/fullscreenerror_event/index.html
index de9e5353c4..502df3c680 100644
--- a/files/zh-cn/web/api/element/onfullscreenerror/index.html
+++ b/files/zh-cn/web/api/element/fullscreenerror_event/index.html
@@ -1,7 +1,8 @@
---
title: Element.onfullscreenerror
-slug: Web/API/Element/onfullscreenerror
+slug: Web/API/Element/fullscreenerror_event
translation_of: Web/API/Element/onfullscreenerror
+original_slug: Web/API/Element/onfullscreenerror
---
<div>{{ApiRef("Fullscreen API")}}</div>
diff --git a/files/zh-cn/web/api/window/ongamepaddisconnected/index.html b/files/zh-cn/web/api/window/gamepaddisconnected_event/index.html
index 7712dd6066..48ef7f7e79 100644
--- a/files/zh-cn/web/api/window/ongamepaddisconnected/index.html
+++ b/files/zh-cn/web/api/window/gamepaddisconnected_event/index.html
@@ -1,7 +1,8 @@
---
title: Window.ongamepaddisconnected
-slug: Web/API/Window/ongamepaddisconnected
+slug: Web/API/Window/gamepaddisconnected_event
translation_of: Web/API/Window/ongamepaddisconnected
+original_slug: Web/API/Window/ongamepaddisconnected
---
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>