aboutsummaryrefslogtreecommitdiff
path: root/files/ja
diff options
context:
space:
mode:
Diffstat (limited to 'files/ja')
-rw-r--r--files/ja/_redirects.txt28
-rw-r--r--files/ja/_wikihistory.json82
-rw-r--r--files/ja/conflicting/web/api/element/localname/index.html (renamed from files/ja/web/api/node/localname/index.html)3
-rw-r--r--files/ja/conflicting/web/api/element/prefix/index.html (renamed from files/ja/web/api/node/prefix/index.html)3
-rw-r--r--files/ja/web/api/element/childelementcount/index.html (renamed from files/ja/web/api/parentnode/childelementcount/index.html)3
-rw-r--r--files/ja/web/api/element/namespaceuri/index.html (renamed from files/ja/web/api/node/namespaceuri/index.html)3
6 files changed, 65 insertions, 57 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 9eace6107e..dc3cf276d5 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -1362,8 +1362,8 @@
/ja/docs/DOM/Node.isSameNode /ja/docs/Web/API/Node/isSameNode
/ja/docs/DOM/Node.isSupported /ja/docs/Web/API/Node/isSupported
/ja/docs/DOM/Node.lastChild /ja/docs/Web/API/Node/lastChild
-/ja/docs/DOM/Node.localName /ja/docs/Web/API/Node/localName
-/ja/docs/DOM/Node.namespaceURI /ja/docs/Web/API/Node/namespaceURI
+/ja/docs/DOM/Node.localName /ja/docs/conflicting/Web/API/Element/localName
+/ja/docs/DOM/Node.namespaceURI /ja/docs/Web/API/Element/namespaceURI
/ja/docs/DOM/Node.nextSibling /ja/docs/Web/API/Node/nextSibling
/ja/docs/DOM/Node.nodeName /ja/docs/Web/API/Node/nodeName
/ja/docs/DOM/Node.nodePrincipal /ja/docs/conflicting/Web/API/Node_378aed5ed6869e50853edbc988cf9556
@@ -1372,7 +1372,7 @@
/ja/docs/DOM/Node.normalize /ja/docs/Web/API/Node/normalize
/ja/docs/DOM/Node.ownerDocument /ja/docs/Web/API/Node/ownerDocument
/ja/docs/DOM/Node.parentNode /ja/docs/Web/API/Node/parentNode
-/ja/docs/DOM/Node.prefix /ja/docs/Web/API/Node/prefix
+/ja/docs/DOM/Node.prefix /ja/docs/conflicting/Web/API/Element/prefix
/ja/docs/DOM/Node.previousSibling /ja/docs/Web/API/Node/previousSibling
/ja/docs/DOM/Node.removeChild /ja/docs/Web/API/Node/removeChild
/ja/docs/DOM/Node.replaceChild /ja/docs/Web/API/Node/replaceChild
@@ -1508,9 +1508,9 @@
/ja/docs/DOM/element.lang /ja/docs/Web/API/HTMLElement/lang
/ja/docs/DOM/element.lastChild /ja/docs/Web/API/Node/lastChild
/ja/docs/DOM/element.length /ja/docs/Web/API/NodeList/length
-/ja/docs/DOM/element.localName /ja/docs/Web/API/Node/localName
+/ja/docs/DOM/element.localName /ja/docs/conflicting/Web/API/Element/localName
/ja/docs/DOM/element.name /ja/docs/conflicting/Web/API
-/ja/docs/DOM/element.namespaceURI /ja/docs/Web/API/Node/namespaceURI
+/ja/docs/DOM/element.namespaceURI /ja/docs/Web/API/Element/namespaceURI
/ja/docs/DOM/element.nextSibling /ja/docs/Web/API/Node/nextSibling
/ja/docs/DOM/element.nodeName /ja/docs/Web/API/Node/nodeName
/ja/docs/DOM/element.nodeType /ja/docs/Web/API/Node/nodeType
@@ -1525,7 +1525,7 @@
/ja/docs/DOM/element.onpaste /ja/docs/Web/API/HTMLElement/onpaste
/ja/docs/DOM/element.ownerDocument /ja/docs/Web/API/Node/ownerDocument
/ja/docs/DOM/element.parentNode /ja/docs/Web/API/Node/parentNode
-/ja/docs/DOM/element.prefix /ja/docs/Web/API/Node/prefix
+/ja/docs/DOM/element.prefix /ja/docs/conflicting/Web/API/Element/prefix
/ja/docs/DOM/element.previousSibling /ja/docs/Web/API/Node/previousSibling
/ja/docs/DOM/element.querySelectorAll /ja/docs/Web/API/Element/querySelectorAll
/ja/docs/DOM/element.removeAttribute /ja/docs/Web/API/Element/removeAttribute
@@ -1812,8 +1812,8 @@
/ja/docs/DOM:element.lang /ja/docs/Web/API/HTMLElement/lang
/ja/docs/DOM:element.lastChild /ja/docs/Web/API/Node/lastChild
/ja/docs/DOM:element.length /ja/docs/Web/API/NodeList/length
-/ja/docs/DOM:element.localName /ja/docs/Web/API/Node/localName
-/ja/docs/DOM:element.namespaceURI /ja/docs/Web/API/Node/namespaceURI
+/ja/docs/DOM:element.localName /ja/docs/conflicting/Web/API/Element/localName
+/ja/docs/DOM:element.namespaceURI /ja/docs/Web/API/Element/namespaceURI
/ja/docs/DOM:element.nextSibling /ja/docs/Web/API/Node/nextSibling
/ja/docs/DOM:element.nodeName /ja/docs/Web/API/Node/nodeName
/ja/docs/DOM:element.nodeType /ja/docs/Web/API/Node/nodeType
@@ -1823,7 +1823,7 @@
/ja/docs/DOM:element.onpaste /ja/docs/Web/API/HTMLElement/onpaste
/ja/docs/DOM:element.ownerDocument /ja/docs/Web/API/Node/ownerDocument
/ja/docs/DOM:element.parentNode /ja/docs/Web/API/Node/parentNode
-/ja/docs/DOM:element.prefix /ja/docs/Web/API/Node/prefix
+/ja/docs/DOM:element.prefix /ja/docs/conflicting/Web/API/Element/prefix
/ja/docs/DOM:element.previousSibling /ja/docs/Web/API/Node/previousSibling
/ja/docs/DOM:element.removeAttribute /ja/docs/Web/API/Element/removeAttribute
/ja/docs/DOM:element.removeAttributeNS /ja/docs/Web/API/Element/removeAttributeNS
@@ -3895,8 +3895,8 @@
/ja/docs/Web/API/Node.isSameNode /ja/docs/Web/API/Node/isSameNode
/ja/docs/Web/API/Node.isSupported /ja/docs/Web/API/Node/isSupported
/ja/docs/Web/API/Node.lastChild /ja/docs/Web/API/Node/lastChild
-/ja/docs/Web/API/Node.localName /ja/docs/Web/API/Node/localName
-/ja/docs/Web/API/Node.namespaceURI /ja/docs/Web/API/Node/namespaceURI
+/ja/docs/Web/API/Node.localName /ja/docs/conflicting/Web/API/Element/localName
+/ja/docs/Web/API/Node.namespaceURI /ja/docs/Web/API/Element/namespaceURI
/ja/docs/Web/API/Node.nextSibling /ja/docs/Web/API/Node/nextSibling
/ja/docs/Web/API/Node.nodeName /ja/docs/Web/API/Node/nodeName
/ja/docs/Web/API/Node.nodePrincipal /ja/docs/conflicting/Web/API/Node_378aed5ed6869e50853edbc988cf9556
@@ -3906,7 +3906,7 @@
/ja/docs/Web/API/Node.ownerDocument /ja/docs/Web/API/Node/ownerDocument
/ja/docs/Web/API/Node.parentElement /ja/docs/Web/API/Node/parentElement
/ja/docs/Web/API/Node.parentNode /ja/docs/Web/API/Node/parentNode
-/ja/docs/Web/API/Node.prefix /ja/docs/Web/API/Node/prefix
+/ja/docs/Web/API/Node.prefix /ja/docs/conflicting/Web/API/Element/prefix
/ja/docs/Web/API/Node.previousSibling /ja/docs/Web/API/Node/previousSibling
/ja/docs/Web/API/Node.removeChild /ja/docs/Web/API/Node/removeChild
/ja/docs/Web/API/Node.replaceChild /ja/docs/Web/API/Node/replaceChild
@@ -3915,9 +3915,13 @@
/ja/docs/Web/API/Node/cloneNode-old /ja/docs/Web/API/Node/getUserData
/ja/docs/Web/API/Node/firstChild-temp /ja/docs/Web/API/Node/firstChild
/ja/docs/Web/API/Node/innerText /ja/docs/Web/API/HTMLElement/innerText
+/ja/docs/Web/API/Node/localName /ja/docs/conflicting/Web/API/Element/localName
+/ja/docs/Web/API/Node/namespaceURI /ja/docs/Web/API/Element/namespaceURI
/ja/docs/Web/API/Node/nodePrincipal /ja/docs/conflicting/Web/API/Node_378aed5ed6869e50853edbc988cf9556
+/ja/docs/Web/API/Node/prefix /ja/docs/conflicting/Web/API/Element/prefix
/ja/docs/Web/API/NodeList.item /ja/docs/Web/API/NodeList/item
/ja/docs/Web/API/NonDocumentTypeChildNode /ja/docs/conflicting/Web/API/Element_861159909c20acebf8e506c3bb0e2f7e
+/ja/docs/Web/API/ParentNode/childElementCount /ja/docs/Web/API/Element/childElementCount
/ja/docs/Web/API/Position /ja/docs/Web/API/GeolocationPosition
/ja/docs/Web/API/PositionError /ja/docs/Web/API/GeolocationPositionError
/ja/docs/Web/API/Push_API/Using_the_Push_API /ja/docs/Web/API/Push_API
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 0cff7990b3..7a4ab0de94 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -18635,27 +18635,6 @@
"Ryotakano"
]
},
- "Web/API/Node/localName": {
- "modified": "2019-03-24T00:02:06.649Z",
- "contributors": [
- "fscholz",
- "khalid32",
- "ethertank",
- "Gomita",
- "Mgjbot",
- "Taken"
- ]
- },
- "Web/API/Node/namespaceURI": {
- "modified": "2019-03-23T23:47:03.400Z",
- "contributors": [
- "fscholz",
- "jsx",
- "ethertank",
- "Mgjbot",
- "Taken"
- ]
- },
"Web/API/Node/nextSibling": {
"modified": "2020-10-15T21:15:36.852Z",
"contributors": [
@@ -18738,19 +18717,6 @@
"Kohei"
]
},
- "Web/API/Node/prefix": {
- "modified": "2020-10-15T21:16:27.942Z",
- "contributors": [
- "YujiSoftware",
- "SphinxKnight",
- "fscholz",
- "khalid32",
- "ethertank",
- "Marsf",
- "Mgjbot",
- "Okome"
- ]
- },
"Web/API/Node/previousSibling": {
"modified": "2019-03-23T23:53:11.427Z",
"contributors": [
@@ -19129,13 +19095,6 @@
"isdh"
]
},
- "Web/API/ParentNode/childElementCount": {
- "modified": "2020-10-29T21:17:58.548Z",
- "contributors": [
- "yumetodo",
- "Marsf"
- ]
- },
"Web/API/ParentNode/children": {
"modified": "2020-11-23T04:45:58.549Z",
"contributors": [
@@ -53496,5 +53455,46 @@
"contributors": [
"mfuji09"
]
+ },
+ "conflicting/Web/API/Element/localName": {
+ "modified": "2019-03-24T00:02:06.649Z",
+ "contributors": [
+ "fscholz",
+ "khalid32",
+ "ethertank",
+ "Gomita",
+ "Mgjbot",
+ "Taken"
+ ]
+ },
+ "Web/API/Element/namespaceURI": {
+ "modified": "2019-03-23T23:47:03.400Z",
+ "contributors": [
+ "fscholz",
+ "jsx",
+ "ethertank",
+ "Mgjbot",
+ "Taken"
+ ]
+ },
+ "conflicting/Web/API/Element/prefix": {
+ "modified": "2020-10-15T21:16:27.942Z",
+ "contributors": [
+ "YujiSoftware",
+ "SphinxKnight",
+ "fscholz",
+ "khalid32",
+ "ethertank",
+ "Marsf",
+ "Mgjbot",
+ "Okome"
+ ]
+ },
+ "Web/API/Element/childElementCount": {
+ "modified": "2020-10-29T21:17:58.548Z",
+ "contributors": [
+ "yumetodo",
+ "Marsf"
+ ]
}
} \ No newline at end of file
diff --git a/files/ja/web/api/node/localname/index.html b/files/ja/conflicting/web/api/element/localname/index.html
index 01ba8fbba6..e8849609d9 100644
--- a/files/ja/web/api/node/localname/index.html
+++ b/files/ja/conflicting/web/api/element/localname/index.html
@@ -1,6 +1,6 @@
---
title: Node.localName
-slug: Web/API/Node/localName
+slug: conflicting/Web/API/Element/localName
tags:
- DOM
- Gecko
@@ -8,6 +8,7 @@ tags:
- Node
- 要更新
translation_of: Web/API/Node/localName
+original_slug: Web/API/Node/localName
---
<p>{{ ApiRef() }}</p>
<h3 id=".E6.A6.82.E8.A6.81" name=".E6.A6.82.E8.A6.81">概要</h3>
diff --git a/files/ja/web/api/node/prefix/index.html b/files/ja/conflicting/web/api/element/prefix/index.html
index 40db95ab12..1b31545519 100644
--- a/files/ja/web/api/node/prefix/index.html
+++ b/files/ja/conflicting/web/api/element/prefix/index.html
@@ -1,11 +1,12 @@
---
title: Node.prefix
-slug: Web/API/Node/prefix
+slug: conflicting/Web/API/Element/prefix
tags:
- DOM
- Gecko
- Node
translation_of: Web/API/Node/prefix
+original_slug: Web/API/Node/prefix
---
<div>{{ApiRef}}</div>
diff --git a/files/ja/web/api/parentnode/childelementcount/index.html b/files/ja/web/api/element/childelementcount/index.html
index 6e1a4b7ea7..a06357d366 100644
--- a/files/ja/web/api/parentnode/childelementcount/index.html
+++ b/files/ja/web/api/element/childelementcount/index.html
@@ -1,12 +1,13 @@
---
title: ParentNode.childElementCount
-slug: Web/API/ParentNode/childElementCount
+slug: Web/API/Element/childElementCount
tags:
- API
- DOM
- ParentNode
- Property
translation_of: Web/API/ParentNode/childElementCount
+original_slug: Web/API/ParentNode/childElementCount
---
<div>{{ APIRef("DOM") }}</div>
diff --git a/files/ja/web/api/node/namespaceuri/index.html b/files/ja/web/api/element/namespaceuri/index.html
index e074636d50..476f51c8b1 100644
--- a/files/ja/web/api/node/namespaceuri/index.html
+++ b/files/ja/web/api/element/namespaceuri/index.html
@@ -1,12 +1,13 @@
---
title: Node.namespaceURI
-slug: Web/API/Node/namespaceURI
+slug: Web/API/Element/namespaceURI
tags:
- DOM
- Gecko
- Gecko DOM Reference
- 要更新
translation_of: Web/API/Node/namespaceURI
+original_slug: Web/API/Node/namespaceURI
---
<p>{{ ApiRef() }}</p>
<h3 id=".E6.A6.82.E8.A6.81" name=".E6.A6.82.E8.A6.81">概要</h3>