aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/de/_redirects.txt1
-rw-r--r--files/de/_wikihistory.json2
-rw-r--r--files/de/web/api/filereader/load_event/index.html (renamed from files/de/web/api/filereader/onload/index.html)3
-rw-r--r--files/es/_redirects.txt1
-rw-r--r--files/es/_wikihistory.json2
-rw-r--r--files/es/web/api/filereader/load_event/index.html (renamed from files/es/web/api/filereader/onload/index.html)3
-rw-r--r--files/ja/_redirects.txt3
-rw-r--r--files/ja/_wikihistory.json36
-rw-r--r--files/ja/conflicting/web/api/filereader/abort_event/index.html (renamed from files/ja/web/api/filereader/onabort/index.html)3
-rw-r--r--files/ja/conflicting/web/api/filereader/error_event/index.html (renamed from files/ja/web/api/filereader/onerror/index.html)3
-rw-r--r--files/ja/conflicting/web/api/filereader/load_event/index.html (renamed from files/ja/web/api/filereader/onload/index.html)3
-rw-r--r--files/pt-br/_redirects.txt1
-rw-r--r--files/pt-br/_wikihistory.json2
-rw-r--r--files/pt-br/web/api/filereader/load_event/index.html (renamed from files/pt-br/web/api/filereader/onload/index.html)3
-rw-r--r--files/ru/_redirects.txt1
-rw-r--r--files/ru/_wikihistory.json14
-rw-r--r--files/ru/web/api/filereader/abort_event/index.html (renamed from files/ru/web/api/filereader/onabort/index.html)3
-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/filereader/abort_event/index.html (renamed from files/zh-cn/web/api/filereader/onabort/index.html)3
-rw-r--r--files/zh-cn/conflicting/web/api/filereader/load_event/index.html (renamed from files/zh-cn/web/api/filereader/onload/index.html)3
21 files changed, 67 insertions, 49 deletions
diff --git a/files/de/_redirects.txt b/files/de/_redirects.txt
index c214e762da..f6ee4d81d4 100644
--- a/files/de/_redirects.txt
+++ b/files/de/_redirects.txt
@@ -424,6 +424,7 @@
/de/docs/Web/API/File/Zugriff_auf_Dateien_von_Webapplikationen /de/docs/Web/API/File/Using_files_from_web_applications
/de/docs/Web/API/File/fileName /de/docs/conflicting/Web/API/File/name
/de/docs/Web/API/File/fileSize /de/docs/Web/API/Blob/size
+/de/docs/Web/API/FileReader/onload /de/docs/Web/API/FileReader/load_event
/de/docs/Web/API/FullscreenOptions /de/docs/orphaned/Web/API/FullscreenOptions
/de/docs/Web/API/IndexedDB_API/IndexedDB_verwenden /de/docs/Web/API/IndexedDB_API/Using_IndexedDB
/de/docs/Web/API/Navigator/registerProtocolHandler/Webbasierte_protokoll-handler /de/docs/Web/API/Navigator/registerProtocolHandler/Web-based_protocol_handlers
diff --git a/files/de/_wikihistory.json b/files/de/_wikihistory.json
index 368a5e8b43..544d6f1274 100644
--- a/files/de/_wikihistory.json
+++ b/files/de/_wikihistory.json
@@ -3038,7 +3038,7 @@
"MatthiasRubin"
]
},
- "Web/API/FileReader/onload": {
+ "Web/API/FileReader/load_event": {
"modified": "2019-03-23T22:41:15.437Z",
"contributors": [
"rehne93",
diff --git a/files/de/web/api/filereader/onload/index.html b/files/de/web/api/filereader/load_event/index.html
index 95dda3e59f..e5fa188074 100644
--- a/files/de/web/api/filereader/onload/index.html
+++ b/files/de/web/api/filereader/load_event/index.html
@@ -1,10 +1,11 @@
---
title: onload
-slug: Web/API/FileReader/onload
+slug: Web/API/FileReader/load_event
tags:
- Dateien
- Lesen
translation_of: Web/API/FileReader/onload
+original_slug: Web/API/FileReader/onload
---
<p>Das onload Event wird ausgelöst, wenn der Inhalt von <a href="/en-US/docs/Web/API/FileReader/readAsArrayBuffer">readAsArrayBuffer</a>, <a href="/en-US/docs/Web/API/FileReader/readAsBinaryString">readAsBinaryString</a>, <a href="/en-US/docs/Web/API/FileReader/readAsDataURL">readAsDataURL</a> or <a href="/en-US/docs/Web/API/FileReader/readAsText">readAsText</a> verfügbar ist.</p>
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index 887c7b77d1..0216d3ebb5 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1545,6 +1545,7 @@
/es/docs/Web/API/Fetch_API/Conceptos_basicos /es/docs/Web/API/Fetch_API/Basic_concepts
/es/docs/Web/API/Fetch_API/Utilizando_Fetch /es/docs/Web/API/Fetch_API/Using_Fetch
/es/docs/Web/API/File/fileName /es/docs/conflicting/Web/API/File/name
+/es/docs/Web/API/FileReader/onload /es/docs/Web/API/FileReader/load_event
/es/docs/Web/API/Geolocalización /es/docs/Web/API/Geolocation
/es/docs/Web/API/Geolocation.clearWatch /es/docs/Web/API/Geolocation/clearWatch
/es/docs/Web/API/Geolocation.getCurrentPosition /es/docs/Web/API/Geolocation/getCurrentPosition
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index e6e246afaa..6466283b7a 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -6627,7 +6627,7 @@
"cm_rocanroll"
]
},
- "Web/API/FileReader/onload": {
+ "Web/API/FileReader/load_event": {
"modified": "2019-03-23T22:18:25.451Z",
"contributors": [
"DaniMartiRamirez"
diff --git a/files/es/web/api/filereader/onload/index.html b/files/es/web/api/filereader/load_event/index.html
index d3172638fd..6722678b4c 100644
--- a/files/es/web/api/filereader/onload/index.html
+++ b/files/es/web/api/filereader/load_event/index.html
@@ -1,6 +1,6 @@
---
title: FileReader.onload
-slug: Web/API/FileReader/onload
+slug: Web/API/FileReader/load_event
tags:
- Archivo
- Controlador de Eventos
@@ -8,6 +8,7 @@ tags:
- Propiedad
- Referencia
translation_of: Web/API/FileReader/onload
+original_slug: Web/API/FileReader/onload
---
<p>{{APIRef}}</p>
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 2165207bd5..98461ee39d 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3110,6 +3110,9 @@
/ja/docs/Web/API/File/fileName /ja/docs/conflicting/Web/API/File/name
/ja/docs/Web/API/File/fileSize /ja/docs/conflicting/Web/API/Blob/size
/ja/docs/Web/API/File/size /ja/docs/Web/API/Blob/size
+/ja/docs/Web/API/FileReader/onabort /ja/docs/conflicting/Web/API/FileReader/abort_event
+/ja/docs/Web/API/FileReader/onerror /ja/docs/conflicting/Web/API/FileReader/error_event
+/ja/docs/Web/API/FileReader/onload /ja/docs/conflicting/Web/API/FileReader/load_event
/ja/docs/Web/API/Geolocation.clearWatch /ja/docs/Web/API/Geolocation/clearWatch
/ja/docs/Web/API/Geolocation.getCurrentPosition /ja/docs/Web/API/Geolocation/getCurrentPosition
/ja/docs/Web/API/Geolocation.watchPosition /ja/docs/Web/API/Geolocation/watchPosition
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 664e7a3bfe..eab8b35361 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -14862,24 +14862,6 @@
"mfuji09"
]
},
- "Web/API/FileReader/onabort": {
- "modified": "2020-09-25T19:31:51.509Z",
- "contributors": [
- "silverskyvicto"
- ]
- },
- "Web/API/FileReader/onerror": {
- "modified": "2020-09-25T19:37:21.563Z",
- "contributors": [
- "silverskyvicto"
- ]
- },
- "Web/API/FileReader/onload": {
- "modified": "2019-03-23T22:37:58.368Z",
- "contributors": [
- "YuichiNukiyama"
- ]
- },
"Web/API/FileReader/progress_event": {
"modified": "2020-10-15T22:16:11.772Z",
"contributors": [
@@ -48412,6 +48394,24 @@
"ethertank"
]
},
+ "conflicting/Web/API/FileReader/abort_event": {
+ "modified": "2020-09-25T19:31:51.509Z",
+ "contributors": [
+ "silverskyvicto"
+ ]
+ },
+ "conflicting/Web/API/FileReader/error_event": {
+ "modified": "2020-09-25T19:37:21.563Z",
+ "contributors": [
+ "silverskyvicto"
+ ]
+ },
+ "conflicting/Web/API/FileReader/load_event": {
+ "modified": "2019-03-23T22:37:58.368Z",
+ "contributors": [
+ "YuichiNukiyama"
+ ]
+ },
"conflicting/Web/API/Geolocation/getCurrentPosition": {
"modified": "2019-03-23T22:19:48.329Z",
"contributors": [
diff --git a/files/ja/web/api/filereader/onabort/index.html b/files/ja/conflicting/web/api/filereader/abort_event/index.html
index 594a867ef5..9aef093dc4 100644
--- a/files/ja/web/api/filereader/onabort/index.html
+++ b/files/ja/conflicting/web/api/filereader/abort_event/index.html
@@ -1,6 +1,6 @@
---
title: FileReader.onabort
-slug: Web/API/FileReader/onabort
+slug: conflicting/Web/API/FileReader/abort_event
tags:
- Event Handler
- File
@@ -8,6 +8,7 @@ tags:
- Property
- Reference
translation_of: Web/API/FileReader/onabort
+original_slug: Web/API/FileReader/onabort
---
<p><strong><code>FileReader.onabort</code></strong> プロパティには、<code><a href="/ja/docs/Web/Events/abort">abort</a></code> イベントが発生したとき、つまりファイルの読み取り処理が中止されたときに実行されるイベント ハンドラが含まれています。</p>
diff --git a/files/ja/web/api/filereader/onerror/index.html b/files/ja/conflicting/web/api/filereader/error_event/index.html
index 77ee74e4c9..d794e3df63 100644
--- a/files/ja/web/api/filereader/onerror/index.html
+++ b/files/ja/conflicting/web/api/filereader/error_event/index.html
@@ -1,7 +1,8 @@
---
title: onerror
-slug: Web/API/FileReader/onerror
+slug: conflicting/Web/API/FileReader/error_event
translation_of: Web/API/FileReader/onerror
+original_slug: Web/API/FileReader/onerror
---
<p><a href="/ja/docs/Web/API/FileReader">FileReader</a> の onerror ハンドラは、Error オブジェクトではなく Event オブジェクトをパラメータとして受け取りますが、エラーは FileReader オブジェクトから <code><a href="/ja/docs/Web/API/FileReader/error">instanceOfFileReader.error</a></code> のようにアクセスすることができます。</p>
diff --git a/files/ja/web/api/filereader/onload/index.html b/files/ja/conflicting/web/api/filereader/load_event/index.html
index cee0e907f9..0dd765290c 100644
--- a/files/ja/web/api/filereader/onload/index.html
+++ b/files/ja/conflicting/web/api/filereader/load_event/index.html
@@ -1,6 +1,6 @@
---
title: FileReader.onload
-slug: Web/API/FileReader/onload
+slug: conflicting/Web/API/FileReader/load_event
tags:
- Event Handler
- File
@@ -8,6 +8,7 @@ tags:
- Property
- Reference
translation_of: Web/API/FileReader/onload
+original_slug: Web/API/FileReader/onload
---
<p>{{APIRef}}</p>
diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt
index 417b063a11..b1d7aa2343 100644
--- a/files/pt-br/_redirects.txt
+++ b/files/pt-br/_redirects.txt
@@ -514,6 +514,7 @@
/pt-BR/docs/Web/API/Element/addEventListener /pt-BR/docs/Web/API/EventTarget/addEventListener
/pt-BR/docs/Web/API/Event/Comparativo_entre_Event_Targets /pt-BR/docs/Web/API/Event/Comparison_of_Event_Targets
/pt-BR/docs/Web/API/Fetch_API/Uso_de_busca_Cross-global /pt-BR/docs/Web/API/Fetch_API/Cross-global_fetch_usage
+/pt-BR/docs/Web/API/FileReader/onload /pt-BR/docs/Web/API/FileReader/load_event
/pt-BR/docs/Web/API/FullscreenOptions /pt-BR/docs/orphaned/Web/API/FullscreenOptions
/pt-BR/docs/Web/API/HTMLContentElement/Seletor /pt-BR/docs/Web/API/HTMLContentElement/select
/pt-BR/docs/Web/API/History_API/Exemplo /pt-BR/docs/Web/API/History_API/Example
diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json
index 361a809bd2..5b2ed45493 100644
--- a/files/pt-br/_wikihistory.json
+++ b/files/pt-br/_wikihistory.json
@@ -5148,7 +5148,7 @@
"helton-mori-dev"
]
},
- "Web/API/FileReader/onload": {
+ "Web/API/FileReader/load_event": {
"modified": "2019-12-24T01:07:36.177Z",
"contributors": [
"euvanribeiro",
diff --git a/files/pt-br/web/api/filereader/onload/index.html b/files/pt-br/web/api/filereader/load_event/index.html
index 53b5774e88..bb33f47c04 100644
--- a/files/pt-br/web/api/filereader/onload/index.html
+++ b/files/pt-br/web/api/filereader/load_event/index.html
@@ -1,6 +1,6 @@
---
title: FileReader.onload
-slug: Web/API/FileReader/onload
+slug: Web/API/FileReader/load_event
tags:
- Arquivo
- Event Handler
@@ -8,6 +8,7 @@ tags:
- Manipulador de eventos
- Propriedade
translation_of: Web/API/FileReader/onload
+original_slug: Web/API/FileReader/onload
---
<p>{{APIRef}}</p>
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index 2f010dde80..aa50f26b06 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -329,6 +329,7 @@
/ru/docs/Web/API/Element/accessKey /ru/docs/Web/API/HTMLElement/accessKey
/ru/docs/Web/API/EventTarget.addEventListener /ru/docs/Web/API/EventTarget/addEventListener
/ru/docs/Web/API/File/fileName /ru/docs/conflicting/Web/API/File/name
+/ru/docs/Web/API/FileReader/onabort /ru/docs/Web/API/FileReader/abort_event
/ru/docs/Web/API/File_and_Directory_Entries_API/Введение /ru/docs/Web/API/File_and_Directory_Entries_API/Introduction
/ru/docs/Web/API/Geolocation/Using_geolocation /ru/docs/Web/API/Geolocation_API
/ru/docs/Web/API/Geolocation/Using_geolocation/Using_the_Geolocation_API /ru/docs/Web/API/Geolocation_API/Using_the_Geolocation_API
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index a46230ec2c..4a8d00b762 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -7987,19 +7987,19 @@
"Excent163"
]
},
- "Web/API/FileReader/error": {
- "modified": "2020-10-15T22:09:49.214Z",
- "contributors": [
- "A-Mikhail"
- ]
- },
- "Web/API/FileReader/onabort": {
+ "Web/API/FileReader/abort_event": {
"modified": "2020-05-07T08:21:21.125Z",
"contributors": [
"Excent163",
"SpaceMotion"
]
},
+ "Web/API/FileReader/error": {
+ "modified": "2020-10-15T22:09:49.214Z",
+ "contributors": [
+ "A-Mikhail"
+ ]
+ },
"Web/API/FileReader/readAsArrayBuffer": {
"modified": "2019-03-23T22:44:45.661Z",
"contributors": [
diff --git a/files/ru/web/api/filereader/onabort/index.html b/files/ru/web/api/filereader/abort_event/index.html
index cf9d62c646..5db067d02c 100644
--- a/files/ru/web/api/filereader/onabort/index.html
+++ b/files/ru/web/api/filereader/abort_event/index.html
@@ -1,7 +1,8 @@
---
title: FileReader.onabort
-slug: Web/API/FileReader/onabort
+slug: Web/API/FileReader/abort_event
translation_of: Web/API/FileReader/onabort
+original_slug: Web/API/FileReader/onabort
---
<p>Значением свойства <strong><code>FileReader.onabort</code></strong> является функция которая вызывается в случае если срабатывает событие <a href="/ru/docs/Web/Events/abort">abort</a>, например когда процесс чтения файла прерывается по каким-либо причинам.  </p>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index e4ba07b3fc..6789bcbf8c 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1343,6 +1343,8 @@
/zh-CN/docs/Web/API/File/fileName /zh-CN/docs/conflicting/Web/API/File/name
/zh-CN/docs/Web/API/File/fileSize /zh-CN/docs/conflicting/Web/API/Blob/size
/zh-CN/docs/Web/API/File/size /zh-CN/docs/conflicting/Web/API/Blob/size_3e7c15d3e7851172bb4623d0237d8c9e
+/zh-CN/docs/Web/API/FileReader/onabort /zh-CN/docs/conflicting/Web/API/FileReader/abort_event
+/zh-CN/docs/Web/API/FileReader/onload /zh-CN/docs/conflicting/Web/API/FileReader/load_event
/zh-CN/docs/Web/API/FileReader/中止事件(abort) /zh-CN/docs/Web/API/FileReader/abort_event
/zh-CN/docs/Web/API/FormData/删除 /zh-CN/docs/Web/API/FormData/delete
/zh-CN/docs/Web/API/Fullscreen_API/指南 /zh-CN/docs/Web/API/Fullscreen_API/Guide
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index db475bbc4d..04de070975 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -13442,18 +13442,6 @@
"qhy90223"
]
},
- "Web/API/FileReader/onabort": {
- "modified": "2019-04-18T04:11:44.611Z",
- "contributors": [
- "allan2coder"
- ]
- },
- "Web/API/FileReader/onload": {
- "modified": "2019-03-23T22:21:51.910Z",
- "contributors": [
- "Cattla"
- ]
- },
"Web/API/FileReader/readAsArrayBuffer": {
"modified": "2019-07-09T04:48:45.088Z",
"contributors": [
@@ -46972,6 +46960,18 @@
"ziyunfei"
]
},
+ "conflicting/Web/API/FileReader/abort_event": {
+ "modified": "2019-04-18T04:11:44.611Z",
+ "contributors": [
+ "allan2coder"
+ ]
+ },
+ "conflicting/Web/API/FileReader/load_event": {
+ "modified": "2019-03-23T22:21:51.910Z",
+ "contributors": [
+ "Cattla"
+ ]
+ },
"conflicting/Web/API/File_and_Directory_Entries_API/Introduction": {
"modified": "2019-03-23T23:17:06.579Z",
"contributors": [
diff --git a/files/zh-cn/web/api/filereader/onabort/index.html b/files/zh-cn/conflicting/web/api/filereader/abort_event/index.html
index d992162230..c899854b36 100644
--- a/files/zh-cn/web/api/filereader/onabort/index.html
+++ b/files/zh-cn/conflicting/web/api/filereader/abort_event/index.html
@@ -1,7 +1,8 @@
---
title: FileReader.onabort
-slug: Web/API/FileReader/onabort
+slug: conflicting/Web/API/FileReader/abort_event
translation_of: Web/API/FileReader/onabort
+original_slug: Web/API/FileReader/onabort
---
<p><strong><code>FileReader.onabort</code></strong> 属性包含在终止事件被触发时执行的事件处理程序,举例,当读取文件的过程中需要中止时。</p>
diff --git a/files/zh-cn/web/api/filereader/onload/index.html b/files/zh-cn/conflicting/web/api/filereader/load_event/index.html
index 971ffa3d37..3d48f35fb0 100644
--- a/files/zh-cn/web/api/filereader/onload/index.html
+++ b/files/zh-cn/conflicting/web/api/filereader/load_event/index.html
@@ -1,9 +1,10 @@
---
title: FileReader.onload
-slug: Web/API/FileReader/onload
+slug: conflicting/Web/API/FileReader/load_event
tags:
- 文件
translation_of: Web/API/FileReader/onload
+original_slug: Web/API/FileReader/onload
---
<p>{{APIRef}}</p>