aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/de/_redirects.txt6
-rw-r--r--files/de/_wikihistory.json28
-rw-r--r--files/de/conflicting/web/api/file/name/index.html (renamed from files/de/web/api/file/filename/index.html)3
-rw-r--r--files/de/web/api/blob/size/index.html (renamed from files/de/web/api/file/filesize/index.html)3
-rw-r--r--files/es/_redirects.txt1
-rw-r--r--files/es/_wikihistory.json16
-rw-r--r--files/es/conflicting/web/api/file/name/index.html (renamed from files/es/web/api/file/filename/index.html)3
-rw-r--r--files/fr/_redirects.txt2
-rw-r--r--files/fr/_wikihistory.json14
-rw-r--r--files/fr/web/api/blob/size/index.html (renamed from files/fr/web/api/file/filesize/index.html)3
-rw-r--r--files/fr/web/api/file/name/index.html (renamed from files/fr/web/api/file/filename/index.html)3
-rw-r--r--files/ja/_redirects.txt10
-rw-r--r--files/ja/_wikihistory.json36
-rw-r--r--files/ja/conflicting/web/api/blob/size/index.html (renamed from files/ja/web/api/file/filesize/index.html)3
-rw-r--r--files/ja/conflicting/web/api/file/name/index.html (renamed from files/ja/web/api/file/filename/index.html)3
-rw-r--r--files/ru/_redirects.txt1
-rw-r--r--files/ru/_wikihistory.json12
-rw-r--r--files/ru/conflicting/web/api/file/name/index.html (renamed from files/ru/web/api/file/filename/index.html)3
-rw-r--r--files/zh-cn/_redirects.txt10
-rw-r--r--files/zh-cn/_wikihistory.json28
-rw-r--r--files/zh-cn/conflicting/web/api/blob/size/index.html (renamed from files/zh-cn/web/api/file/filesize/index.html)3
-rw-r--r--files/zh-cn/conflicting/web/api/file/name/index.html (renamed from files/zh-cn/web/api/file/filename/index.html)3
-rw-r--r--files/zh-tw/_redirects.txt1
-rw-r--r--files/zh-tw/_wikihistory.json2
-rw-r--r--files/zh-tw/web/api/file/name/index.html (renamed from files/zh-tw/web/api/file/filename/index.html)3
25 files changed, 111 insertions, 89 deletions
diff --git a/files/de/_redirects.txt b/files/de/_redirects.txt
index 30ab6fb6ff..337bc6522a 100644
--- a/files/de/_redirects.txt
+++ b/files/de/_redirects.txt
@@ -195,8 +195,8 @@
/de/docs/CSS_Referenz/Mozilla_CSS_Erweiterungen /de/docs/Web/CSS/Mozilla_Extensions
/de/docs/CSS_in_HTML_einbinden /de/docs/Web/CSS/@import
/de/docs/DOM /de/docs/Web/API/Document_Object_Model
-/de/docs/DOM/File.fileName /de/docs/Web/API/File/fileName
-/de/docs/DOM/File.fileSize /de/docs/Web/API/File/fileSize
+/de/docs/DOM/File.fileName /de/docs/conflicting/Web/API/File/name
+/de/docs/DOM/File.fileSize /de/docs/Web/API/Blob/size
/de/docs/DOM/File.name /de/docs/Web/API/File/name
/de/docs/DOM/Node /de/docs/Web/API/Node
/de/docs/DOM/Node.childNodes /de/docs/Web/API/Node/childNodes
@@ -421,6 +421,8 @@
/de/docs/Web/API/Element.querySelector /de/docs/Web/API/Element/querySelector
/de/docs/Web/API/File/Typ /de/docs/Web/API/File/type
/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/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 a402e431bf..8a0840e847 100644
--- a/files/de/_wikihistory.json
+++ b/files/de/_wikihistory.json
@@ -2245,6 +2245,13 @@
"fscholz"
]
},
+ "Web/API/Blob/size": {
+ "modified": "2019-03-23T23:33:53.208Z",
+ "contributors": [
+ "fscholz",
+ "nothine"
+ ]
+ },
"Web/API/CSS": {
"modified": "2020-10-15T22:34:59.314Z",
"contributors": [
@@ -3008,20 +3015,6 @@
"matschu"
]
},
- "Web/API/File/fileName": {
- "modified": "2019-03-23T23:33:53.570Z",
- "contributors": [
- "fscholz",
- "nothine"
- ]
- },
- "Web/API/File/fileSize": {
- "modified": "2019-03-23T23:33:53.208Z",
- "contributors": [
- "fscholz",
- "nothine"
- ]
- },
"Web/API/File/name": {
"modified": "2019-03-23T23:33:48.935Z",
"contributors": [
@@ -13569,6 +13562,13 @@
"Sheppy"
]
},
+ "conflicting/Web/API/File/name": {
+ "modified": "2019-03-23T23:33:53.570Z",
+ "contributors": [
+ "fscholz",
+ "nothine"
+ ]
+ },
"conflicting/Web/API/WindowOrWorkerGlobalScope": {
"modified": "2019-03-23T23:01:42.969Z",
"contributors": [
diff --git a/files/de/web/api/file/filename/index.html b/files/de/conflicting/web/api/file/name/index.html
index 7dbf4f7559..af385a0406 100644
--- a/files/de/web/api/file/filename/index.html
+++ b/files/de/conflicting/web/api/file/name/index.html
@@ -1,10 +1,11 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: conflicting/Web/API/File/name
tags:
- DOM
- Files
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}}</p>
diff --git a/files/de/web/api/file/filesize/index.html b/files/de/web/api/blob/size/index.html
index 0c91c5f739..f4d832f944 100644
--- a/files/de/web/api/file/filesize/index.html
+++ b/files/de/web/api/blob/size/index.html
@@ -1,11 +1,12 @@
---
title: File.fileSize
-slug: Web/API/File/fileSize
+slug: Web/API/Blob/size
tags:
- DOM
- Files
- Property
translation_of: Web/API/File/fileSize
+original_slug: Web/API/File/fileSize
---
<p>{{APIRef("File API") }}{{non-standard_header}}</p>
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index f6c93836da..a07f527a28 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1537,6 +1537,7 @@
/es/docs/Web/API/Event/createEvent /es/docs/Web/API/Document/createEvent
/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/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 070b6132b6..4b1222be2c 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -6609,14 +6609,6 @@
"Izel"
]
},
- "Web/API/File/fileName": {
- "modified": "2020-02-09T09:40:59.258Z",
- "contributors": [
- "blanchart",
- "IsraelFloresDGA",
- "BrodaNoel"
- ]
- },
"Web/API/File/lastModifiedDate": {
"modified": "2019-03-23T22:06:34.338Z",
"contributors": [
@@ -21362,6 +21354,14 @@
"tureey"
]
},
+ "conflicting/Web/API/File/name": {
+ "modified": "2020-02-09T09:40:59.258Z",
+ "contributors": [
+ "blanchart",
+ "IsraelFloresDGA",
+ "BrodaNoel"
+ ]
+ },
"conflicting/Web/API/Geolocation": {
"modified": "2019-03-23T23:01:31.642Z",
"contributors": [
diff --git a/files/es/web/api/file/filename/index.html b/files/es/conflicting/web/api/file/name/index.html
index 2179e85756..5813cf521c 100644
--- a/files/es/web/api/file/filename/index.html
+++ b/files/es/conflicting/web/api/file/name/index.html
@@ -1,6 +1,6 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: conflicting/Web/API/File/name
tags:
- API
- Archivos
@@ -9,6 +9,7 @@ tags:
- Propiedad
- Referencia
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}} {{obsolete_header(7.0)}}</p>
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index c0500acf6e..b429d17874 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -3647,6 +3647,8 @@
/fr/docs/Web/API/EventTarget/attachEvent /fr/docs/Web/API/EventTarget/addEventListener
/fr/docs/Web/API/EventTarget/detachEvent /fr/docs/Web/API/EventTarget/removeEventListener
/fr/docs/Web/API/EventTarget/fireEvent /fr/docs/Web/API/EventTarget/dispatchEvent
+/fr/docs/Web/API/File/fileName /fr/docs/Web/API/File/name
+/fr/docs/Web/API/File/fileSize /fr/docs/Web/API/Blob/size
/fr/docs/Web/API/FileList/FileList /fr/docs/Web/API/FileList
/fr/docs/Web/API/FileReader/FileList /fr/docs/Web/API/FileList
/fr/docs/Web/API/FormData/Utilisation_objets_FormData /fr/docs/Web/API/FormData/Using_FormData_Objects
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index 0d9b5c1352..d0a2f3d840 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -11979,6 +11979,12 @@
"wlalele"
]
},
+ "Web/API/Blob/size": {
+ "modified": "2019-03-18T21:38:36.545Z",
+ "contributors": [
+ "loella16"
+ ]
+ },
"Web/API/Blob/type": {
"modified": "2020-10-15T21:55:27.760Z",
"contributors": [
@@ -15867,18 +15873,12 @@
"jean_pierre"
]
},
- "Web/API/File/fileName": {
+ "Web/API/File/name": {
"modified": "2019-03-18T21:38:44.194Z",
"contributors": [
"loella16"
]
},
- "Web/API/File/fileSize": {
- "modified": "2019-03-18T21:38:36.545Z",
- "contributors": [
- "loella16"
- ]
- },
"Web/API/FileList": {
"modified": "2020-10-15T21:10:58.823Z",
"contributors": [
diff --git a/files/fr/web/api/file/filesize/index.html b/files/fr/web/api/blob/size/index.html
index b7d03c1e7d..8896e44695 100644
--- a/files/fr/web/api/file/filesize/index.html
+++ b/files/fr/web/api/blob/size/index.html
@@ -1,12 +1,13 @@
---
title: File.fileSize
-slug: Web/API/File/fileSize
+slug: Web/API/Blob/size
tags:
- API
- DOM
- Fichier
- Propriétés
translation_of: Web/API/File/fileSize
+original_slug: Web/API/File/fileSize
---
<p>{{APIRef("File API") }}{{non-standard_header}}</p>
diff --git a/files/fr/web/api/file/filename/index.html b/files/fr/web/api/file/name/index.html
index 50942c002b..2dddc3083c 100644
--- a/files/fr/web/api/file/filename/index.html
+++ b/files/fr/web/api/file/name/index.html
@@ -1,6 +1,6 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: Web/API/File/name
tags:
- API
- DOM
@@ -8,6 +8,7 @@ tags:
- Nom
- Propriétés
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}}</p>
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index a242e36d4b..2fd494e351 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -1138,8 +1138,8 @@
/ja/docs/DOM/EventTarget.addEventListener /ja/docs/Web/API/EventTarget/addEventListener
/ja/docs/DOM/EventTarget.dispatchEvent /ja/docs/Web/API/EventTarget/dispatchEvent
/ja/docs/DOM/EventTarget.removeEventListener /ja/docs/Web/API/EventTarget/removeEventListener
-/ja/docs/DOM/File.fileName /ja/docs/Web/API/File/fileName
-/ja/docs/DOM/File.fileSize /ja/docs/Web/API/File/fileSize
+/ja/docs/DOM/File.fileName /ja/docs/conflicting/Web/API/File/name
+/ja/docs/DOM/File.fileSize /ja/docs/conflicting/Web/API/Blob/size
/ja/docs/DOM/File.getAsBinary /ja/docs/Web/API/File/getAsBinary
/ja/docs/DOM/File.getAsText /ja/docs/Web/API/File/getAsText
/ja/docs/DOM/File.lastModifiedDate /ja/docs/Web/API/File/lastModifiedDate
@@ -3087,13 +3087,15 @@
/ja/docs/Web/API/EventTarget.removeEventListener /ja/docs/Web/API/EventTarget/removeEventListener
/ja/docs/Web/API/EventTarget/attachEvent /ja/docs/Web/API/EventTarget/addEventListener
/ja/docs/Web/API/FetchEvent_clone /ja/docs/Web/API/FetchEvent
-/ja/docs/Web/API/File.fileName /ja/docs/Web/API/File/fileName
-/ja/docs/Web/API/File.fileSize /ja/docs/Web/API/File/fileSize
+/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.getAsBinary /ja/docs/Web/API/File/getAsBinary
/ja/docs/Web/API/File.getAsText /ja/docs/Web/API/File/getAsText
/ja/docs/Web/API/File.name /ja/docs/Web/API/File/name
/ja/docs/Web/API/File.size /ja/docs/Web/API/Blob/size
/ja/docs/Web/API/File.type /ja/docs/Web/API/Blob/type
+/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/Geolocation.clearWatch /ja/docs/Web/API/Geolocation/clearWatch
/ja/docs/Web/API/Geolocation.getCurrentPosition /ja/docs/Web/API/Geolocation/getCurrentPosition
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index bc08f24725..de3c610c46 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -14802,24 +14802,6 @@
"souta"
]
},
- "Web/API/File/fileName": {
- "modified": "2020-09-25T16:45:23.436Z",
- "contributors": [
- "silverskyvicto",
- "mfuji09",
- "fscholz",
- "ethertank"
- ]
- },
- "Web/API/File/fileSize": {
- "modified": "2020-09-25T16:46:05.461Z",
- "contributors": [
- "silverskyvicto",
- "mfuji09",
- "fscholz",
- "ethertank"
- ]
- },
"Web/API/File/getAsBinary": {
"modified": "2019-11-18T15:13:21.722Z",
"contributors": [
@@ -48559,6 +48541,24 @@
"silverskyvicto"
]
},
+ "conflicting/Web/API/Blob/size": {
+ "modified": "2020-09-25T16:46:05.461Z",
+ "contributors": [
+ "silverskyvicto",
+ "mfuji09",
+ "fscholz",
+ "ethertank"
+ ]
+ },
+ "conflicting/Web/API/File/name": {
+ "modified": "2020-09-25T16:45:23.436Z",
+ "contributors": [
+ "silverskyvicto",
+ "mfuji09",
+ "fscholz",
+ "ethertank"
+ ]
+ },
"conflicting/Web/API/XRInputSource/handedness": {
"modified": "2020-12-06T13:23:10.937Z",
"contributors": [
diff --git a/files/ja/web/api/file/filesize/index.html b/files/ja/conflicting/web/api/blob/size/index.html
index 21ee3a0562..fc843a8033 100644
--- a/files/ja/web/api/file/filesize/index.html
+++ b/files/ja/conflicting/web/api/blob/size/index.html
@@ -1,6 +1,6 @@
---
title: File.fileSize
-slug: Web/API/File/fileSize
+slug: conflicting/Web/API/Blob/size
tags:
- DOM
- File API
@@ -12,6 +12,7 @@ tags:
- ファイル
- プロパティ
translation_of: Web/API/File/fileSize
+original_slug: Web/API/File/fileSize
---
<p>{{APIRef("File API") }}{{non-standard_header}}{{obsolete_header(7.0)}}</p>
diff --git a/files/ja/web/api/file/filename/index.html b/files/ja/conflicting/web/api/file/name/index.html
index 8096f58d4e..424b4b7685 100644
--- a/files/ja/web/api/file/filename/index.html
+++ b/files/ja/conflicting/web/api/file/name/index.html
@@ -1,6 +1,6 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: conflicting/Web/API/File/name
tags:
- API
- DOM
@@ -11,6 +11,7 @@ tags:
- Property
- Reference
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}}{{obsolete_header(7.0)}}</p>
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index e9d4e75587..b61407949d 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -323,6 +323,7 @@
/ru/docs/Web/API/Element.insertAdjacentHTML /ru/docs/Web/API/Element/insertAdjacentHTML
/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/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 388b670bc8..d77429f430 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -7980,12 +7980,6 @@
"Lambrusco.pro"
]
},
- "Web/API/File/fileName": {
- "modified": "2019-03-23T22:09:17.877Z",
- "contributors": [
- "Ferguse"
- ]
- },
"Web/API/File/getAsDataURL": {
"modified": "2019-03-23T22:18:17.148Z",
"contributors": [
@@ -24190,6 +24184,12 @@
"paulvoloschuk"
]
},
+ "conflicting/Web/API/File/name": {
+ "modified": "2019-03-23T22:09:17.877Z",
+ "contributors": [
+ "Ferguse"
+ ]
+ },
"conflicting/Web/API/Geolocation": {
"modified": "2019-03-23T22:43:32.725Z",
"contributors": [
diff --git a/files/ru/web/api/file/filename/index.html b/files/ru/conflicting/web/api/file/name/index.html
index 6b236d1cf1..957bf8e41e 100644
--- a/files/ru/web/api/file/filename/index.html
+++ b/files/ru/conflicting/web/api/file/name/index.html
@@ -1,7 +1,8 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: conflicting/Web/API/File/name
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}}</p>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 53cc404b6a..24c212fc84 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -223,8 +223,8 @@
/zh-CN/docs/DOM/Element.querySelectorAll /zh-CN/docs/Web/API/Element/querySelectorAll
/zh-CN/docs/DOM/EventTarget /zh-CN/docs/Web/API/EventTarget
/zh-CN/docs/DOM/File /zh-CN/docs/Web/API/File
-/zh-CN/docs/DOM/File.fileName /zh-CN/docs/Web/API/File/fileName
-/zh-CN/docs/DOM/File.fileSize /zh-CN/docs/Web/API/File/fileSize
+/zh-CN/docs/DOM/File.fileName /zh-CN/docs/conflicting/Web/API/File/name
+/zh-CN/docs/DOM/File.fileSize /zh-CN/docs/conflicting/Web/API/Blob/size
/zh-CN/docs/DOM/File.getAsBinary /zh-CN/docs/Web/API/File/getAsBinary
/zh-CN/docs/DOM/File.getAsText /zh-CN/docs/Web/API/File/getAsText
/zh-CN/docs/DOM/File.lastModifiedDate /zh-CN/docs/Web/API/File/lastModifiedDate
@@ -1319,12 +1319,14 @@
/zh-CN/docs/Web/API/FetchController/AbortController /zh-CN/docs/Web/API/AbortController/AbortController
/zh-CN/docs/Web/API/FetchController/abort /zh-CN/docs/Web/API/AbortController/abort
/zh-CN/docs/Web/API/Fetch_API/基本概念 /zh-CN/docs/Web/API/Fetch_API/Basic_concepts
-/zh-CN/docs/Web/API/File.fileName /zh-CN/docs/Web/API/File/fileName
-/zh-CN/docs/Web/API/File.fileSize /zh-CN/docs/Web/API/File/fileSize
+/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.getAsBinary /zh-CN/docs/Web/API/File/getAsBinary
/zh-CN/docs/Web/API/File.getAsText /zh-CN/docs/Web/API/File/getAsText
/zh-CN/docs/Web/API/File.lastModifiedDate /zh-CN/docs/Web/API/File/lastModifiedDate
/zh-CN/docs/Web/API/File.name /zh-CN/docs/Web/API/File/name
+/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/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 540fe29b2a..f5a9fec677 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -13350,20 +13350,6 @@
"QizhongFang"
]
},
- "Web/API/File/fileName": {
- "modified": "2019-03-23T23:33:53.867Z",
- "contributors": [
- "teoli",
- "ziyunfei"
- ]
- },
- "Web/API/File/fileSize": {
- "modified": "2019-03-23T23:33:53.292Z",
- "contributors": [
- "teoli",
- "ziyunfei"
- ]
- },
"Web/API/File/getAsBinary": {
"modified": "2019-03-24T00:16:15.441Z",
"contributors": [
@@ -46974,6 +46960,13 @@
"xgqfrms"
]
},
+ "conflicting/Web/API/Blob/size": {
+ "modified": "2019-03-23T23:33:53.292Z",
+ "contributors": [
+ "teoli",
+ "ziyunfei"
+ ]
+ },
"conflicting/Web/API/Canvas_API/Tutorial": {
"modified": "2019-03-23T23:20:14.159Z",
"contributors": [
@@ -47137,6 +47130,13 @@
"daisyHawen"
]
},
+ "conflicting/Web/API/File/name": {
+ "modified": "2019-03-23T23:33:53.867Z",
+ "contributors": [
+ "teoli",
+ "ziyunfei"
+ ]
+ },
"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/file/filesize/index.html b/files/zh-cn/conflicting/web/api/blob/size/index.html
index a434d9db7c..1975c7c0b2 100644
--- a/files/zh-cn/web/api/file/filesize/index.html
+++ b/files/zh-cn/conflicting/web/api/blob/size/index.html
@@ -1,7 +1,8 @@
---
title: File.fileSize
-slug: Web/API/File/fileSize
+slug: conflicting/Web/API/Blob/size
translation_of: Web/API/File/fileSize
+original_slug: Web/API/File/fileSize
---
<div>
<p>{{APIRef("File API") }}{{non-standard_header}}</p>
diff --git a/files/zh-cn/web/api/file/filename/index.html b/files/zh-cn/conflicting/web/api/file/name/index.html
index 4a1a83889e..ee26420b69 100644
--- a/files/zh-cn/web/api/file/filename/index.html
+++ b/files/zh-cn/conflicting/web/api/file/name/index.html
@@ -1,7 +1,8 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: conflicting/Web/API/File/name
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<div>
<p>{{APIRef("File API") }}{{non-standard_header}}</p>
diff --git a/files/zh-tw/_redirects.txt b/files/zh-tw/_redirects.txt
index ba04b91d36..15d6d7d893 100644
--- a/files/zh-tw/_redirects.txt
+++ b/files/zh-tw/_redirects.txt
@@ -544,6 +544,7 @@
/zh-TW/docs/Web/API/Document_Object_Model/事件 /zh-TW/docs/orphaned/Web/API/Document_Object_Model/Events
/zh-TW/docs/Web/API/ElementCSSInlineStyle/style /zh-TW/docs/orphaned/Web/API/ElementCSSInlineStyle/style
/zh-TW/docs/Web/API/Event/createEvent /zh-TW/docs/Web/API/Document/createEvent
+/zh-TW/docs/Web/API/File/fileName /zh-TW/docs/Web/API/File/name
/zh-TW/docs/Web/API/Geolocation/Using_geolocation /zh-TW/docs/Web/API/Geolocation_API
/zh-TW/docs/Web/API/HTMLElement/dataset /zh-TW/docs/orphaned/Web/API/HTMLOrForeignElement/dataset
/zh-TW/docs/Web/API/HTMLElement/style /zh-TW/docs/orphaned/Web/API/ElementCSSInlineStyle/style
diff --git a/files/zh-tw/_wikihistory.json b/files/zh-tw/_wikihistory.json
index bbfdfa477f..1185efe0ba 100644
--- a/files/zh-tw/_wikihistory.json
+++ b/files/zh-tw/_wikihistory.json
@@ -3654,7 +3654,7 @@
"orinx"
]
},
- "Web/API/File/fileName": {
+ "Web/API/File/name": {
"modified": "2019-03-23T22:06:22.686Z",
"contributors": [
"lynn456"
diff --git a/files/zh-tw/web/api/file/filename/index.html b/files/zh-tw/web/api/file/name/index.html
index 0e6cceb4f3..1581728451 100644
--- a/files/zh-tw/web/api/file/filename/index.html
+++ b/files/zh-tw/web/api/file/name/index.html
@@ -1,7 +1,8 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: Web/API/File/name
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}}</p>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 14:06:20 +0000