JavaScript/Reference/Global_Objects/escape および unescape を削除 (#1558)

conflicting 版は古いため削除

4 files changed, 8 insertions, 96 deletions

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index fe9a4302ff..fdc6792448 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -1559,7 +1559,7 @@
 /ja/docs/DOM/window.directories	/ja/docs/Web/API/Window/directories
 /ja/docs/DOM/window.document	/ja/docs/Web/API/Window/document
 /ja/docs/DOM/window.dump	/ja/docs/Web/API/Window/dump
-/ja/docs/DOM/window.escape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/escape
+/ja/docs/DOM/window.escape	/ja/docs/Web/JavaScript/Reference/Global_Objects/escape
 /ja/docs/DOM/window.find	/ja/docs/Web/API/Window/find
 /ja/docs/DOM/window.focus	/ja/docs/Web/API/Window/focus
 /ja/docs/DOM/window.forward	/ja/docs/Web/API/Window/forward
@@ -1670,7 +1670,7 @@
 /ja/docs/DOM/window.stop	/ja/docs/Web/API/Window/stop
 /ja/docs/DOM/window.toolbar	/ja/docs/Web/API/Window/toolbar
 /ja/docs/DOM/window.top	/ja/docs/Web/API/Window/top
-/ja/docs/DOM/window.unescape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/unescape
+/ja/docs/DOM/window.unescape	/ja/docs/Web/JavaScript/Reference/Global_Objects/unescape
 /ja/docs/DOM/window.updateCommands	/ja/docs/Web/API/Window/updateCommands
 /ja/docs/DOM/window.window	/ja/docs/Web/API/Window/window
 /ja/docs/DOM/セレクタを使用した_DOM_要素の指定	/ja/docs/Web/API/Node/cloneNode
@@ -1790,7 +1790,7 @@
 /ja/docs/DOM:window.directories	/ja/docs/Web/API/Window/directories
 /ja/docs/DOM:window.document	/ja/docs/Web/API/Window/document
 /ja/docs/DOM:window.dump	/ja/docs/Web/API/Window/dump
-/ja/docs/DOM:window.escape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/escape
+/ja/docs/DOM:window.escape	/ja/docs/Web/JavaScript/Reference/Global_Objects/escape
 /ja/docs/DOM:window.find	/ja/docs/Web/API/Window/find
 /ja/docs/DOM:window.focus	/ja/docs/Web/API/Window/focus
 /ja/docs/DOM:window.forward	/ja/docs/Web/API/Window/forward
@@ -1886,7 +1886,7 @@
 /ja/docs/DOM:window.stop	/ja/docs/Web/API/Window/stop
 /ja/docs/DOM:window.toolbar	/ja/docs/Web/API/Window/toolbar
 /ja/docs/DOM:window.top	/ja/docs/Web/API/Window/top
-/ja/docs/DOM:window.unescape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/unescape
+/ja/docs/DOM:window.unescape	/ja/docs/Web/JavaScript/Reference/Global_Objects/unescape
 /ja/docs/DOM:window.updateCommands	/ja/docs/Web/API/Window/updateCommands
 /ja/docs/DOM:window.window	/ja/docs/Web/API/Window/window
 /ja/docs/DOMParser	/ja/docs/Web/API/DOMParser
@@ -3801,7 +3801,7 @@
 /ja/docs/Web/API/Window/URL	/ja/docs/conflicting/Web/API/URL
 /ja/docs/Web/API/Window/arguments	/ja/docs/orphaned/Working_with_windows_in_chrome_code
 /ja/docs/Web/API/Window/dispatchEvent	/ja/docs/Web/API/EventTarget/dispatchEvent
-/ja/docs/Web/API/Window/escape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/escape
+/ja/docs/Web/API/Window/escape	/ja/docs/Web/JavaScript/Reference/Global_Objects/escape
 /ja/docs/Web/API/Window/getAttention	/ja/docs/orphaned/Web/API/Window/getAttention
 /ja/docs/Web/API/Window/onafterprint	/ja/docs/Web/API/WindowEventHandlers/onafterprint
 /ja/docs/Web/API/Window/onblur	/ja/docs/Web/API/GlobalEventHandlers/onblur
@@ -3820,7 +3820,7 @@
 /ja/docs/Web/API/Window/restore	/ja/docs/conflicting/Web/API/Window/moveTo
 /ja/docs/Web/API/Window/setInterval	/ja/docs/Web/API/WindowOrWorkerGlobalScope/setInterval
 /ja/docs/Web/API/Window/setTimeout	/ja/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout
-/ja/docs/Web/API/Window/unescape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/unescape
+/ja/docs/Web/API/Window/unescape	/ja/docs/Web/JavaScript/Reference/Global_Objects/unescape
 /ja/docs/Web/API/Window/vrdisplaydisconnected_event	/ja/docs/Web/API/Window/vrdisplaydisconnect_event
 /ja/docs/Web/API/WindowBase64	/ja/docs/Web/API/WindowOrWorkerGlobalScope
 /ja/docs/Web/API/WindowBase64/Base64_encoding_and_decoding	/ja/docs/Glossary/Base64
@@ -3965,7 +3965,7 @@
 /ja/docs/Web/API/window.directories	/ja/docs/Web/API/Window/directories
 /ja/docs/Web/API/window.document	/ja/docs/Web/API/Window/document
 /ja/docs/Web/API/window.dump	/ja/docs/Web/API/Window/dump
-/ja/docs/Web/API/window.escape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/escape
+/ja/docs/Web/API/window.escape	/ja/docs/Web/JavaScript/Reference/Global_Objects/escape
 /ja/docs/Web/API/window.find	/ja/docs/Web/API/Window/find
 /ja/docs/Web/API/window.focus	/ja/docs/Web/API/Window/focus
 /ja/docs/Web/API/window.forward	/ja/docs/Web/API/Window/forward
@@ -4069,7 +4069,7 @@
 /ja/docs/Web/API/window.stop	/ja/docs/Web/API/Window/stop
 /ja/docs/Web/API/window.toolbar	/ja/docs/Web/API/Window/toolbar
 /ja/docs/Web/API/window.top	/ja/docs/Web/API/Window/top
-/ja/docs/Web/API/window.unescape	/ja/docs/conflicting/Web/JavaScript/Reference/Global_Objects/unescape
+/ja/docs/Web/API/window.unescape	/ja/docs/Web/JavaScript/Reference/Global_Objects/unescape
 /ja/docs/Web/API/window.updateCommands	/ja/docs/Web/API/Window/updateCommands
 /ja/docs/Web/API/window.window	/ja/docs/Web/API/Window/window
 /ja/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role	/ja/docs/Web/Accessibility/ARIA/Roles/button_role
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 9f2997e36e..beeadcf2ee 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -48580,24 +48580,6 @@
       "ukyo"
     ]
   },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/escape": {
-    "modified": "2019-03-23T23:51:01.376Z",
-    "contributors": [
-      "teoli",
-      "AshfaqHossain",
-      "ethertank",
-      "Potappo"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/unescape": {
-    "modified": "2019-03-23T23:51:01.509Z",
-    "contributors": [
-      "fscholz",
-      "AshfaqHossain",
-      "ethertank",
-      "Potappo"
-    ]
-  },
   "conflicting/Web/JavaScript/Reference/Lexical_grammar": {
     "modified": "2019-12-24T12:46:59.479Z",
     "contributors": [
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html
deleted file mode 100644
index c8cdd4711c..0000000000
--- a/files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: window.escape
-slug: conflicting/Web/JavaScript/Reference/Global_Objects/escape
-tags:
-  - DOM
-  - DOM_0
-  - Gecko
-  - Gecko DOM Reference
-  - Window
-translation_of: Web/JavaScript/Reference/Global_Objects/escape
-translation_of_original: Web/API/Window.escape
-original_slug: Web/API/Window/escape
----
-<div>
- {{ApiRef}}</div>
-<h2 id="Summary" name="Summary">概要</h2>
-<p>文字列をエンコードし、16 進エスケープシーケンスで表された特定の文字に置換します。</p>
-<h2 id="Syntax" name="Syntax">構文</h2>
-<pre class="syntaxbox"><var>escaped</var> = escape(<i>regular</i>);
-</pre>
-<ul>
- <li><code>escaped</code> は、エンコードされた文字列です。</li>
- <li><code>regular</code> は、通常の文字列です。</li>
-</ul>
-<h2 id="Example" name="Example">例</h2>
-<pre class="brush:js">alert( escape("http://www.cnn.com") ); // 表示結果: http%3A//www.cnn.com
-</pre>
-<h2 id="Notes" name="Notes">注記</h2>
-<p><code>escape()</code> メソッドは、特別な文字（通常のテキストや数字ではない文字）を 16 進文字にエンコードします。これは、特に、クッキーの値を設定するために必要となります。また、GET リクエストや AJAX GET/POST リクエストの URL で
- <i>
-  name=value</i>
- のような組のデータを渡すときにも役立ちます。</p>
-<p>{{domxref("window.unescape")}} 、<a href="/ja/docs/JavaScript/Reference/Global_Objects/encodeURIComponent"><code>encodeURIComponent</code></a> も参照してください。</p>
-<h2 id="Specification" name="Specification">仕様</h2>
-<p>{{DOM0}} 但し、ECMA-262 の非標準化セクションで言及されています。</p>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html
deleted file mode 100644
index 64f70e8d54..0000000000
--- a/files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: window.unescape
-slug: conflicting/Web/JavaScript/Reference/Global_Objects/unescape
-tags:
-  - DOM
-  - DOM_0
-  - Gecko
-  - Gecko DOM Reference
-  - Window
-translation_of: Web/JavaScript/Reference/Global_Objects/unescape
-translation_of_original: Web/API/Window.unescape
-original_slug: Web/API/Window/unescape
----
-<div>
- {{ApiRef}}</div>
-<h2 id="Summary" name="Summary">概要</h2>
-<p>16 進でエンコードされた値（例えば、クッキー）をデコードします。</p>
-<h2 id="Syntax" name="Syntax">構文</h2>
-<pre class="syntaxbox"><var>regular</var> = window.unescape(<i>escaped</i>)</pre>
-<ul>
- <li><code>regular</code> : 通常の文字列</li>
- <li><code>encoded</code> : エンコードされた文字列</li>
-</ul>
-<h2 id="Example" name="Example">例</h2>
-<pre class="brush:js">alert( unescape("%5C") );  // 表示結果: "\"
-
-alert( unescape("https%3A//developer.mozilla.org") );  // 表示結果: "https://developer.mozilla.org"
-</pre>
-<h2 id="Specification" name="Specification">仕様</h2>
-<p>{{DOM0}} 但し、ECMA-262 の非標準化セクションで言及されています。</p>
-<h2 id="See_also" name="See_also">関連情報</h2>
-<ul>
- <li>{{domxref("window.escape")}}</li>
- <li><a href="/ja/docs/JavaScript/Reference/Global_Functions/encodeURIComponent"><code>decodeURIComponent</code></a></li>
-</ul>