diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt index 09d79d1bf71c2a..a07f2825672a32 100644 --- a/files/ru/_redirects.txt +++ b/files/ru/_redirects.txt @@ -4,7 +4,7 @@ # yarn content add-redirect # # FROM-URL TO-URL -/ru/docs/AJAX /ru/docs/Web/Guide/AJAX +/ru/docs/AJAX /ru/docs/conflicting/Learn/JavaScript/Client-side_web_APIs/Fetching_data /ru/docs/AJAX/С_чего_начать /ru/docs/conflicting/Web/Guide/AJAX /ru/docs/AJAX:С_чего_начать /ru/docs/conflicting/Web/Guide/AJAX /ru/docs/Accessibility /ru/docs/Web/Accessibility @@ -531,6 +531,7 @@ /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/onpaint /ru/docs/orphaned/Web/API/Window/onpaint +/ru/docs/Web/API/Window/pageYOffset /ru/docs/conflicting/Web/API/Window/scrollY /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 @@ -696,6 +697,7 @@ /ru/docs/Web/Events/transitionend /ru/docs/Web/API/Element/transitionend_event /ru/docs/Web/Events/unhandledrejection /ru/docs/Web/API/Window/unhandledrejection_event /ru/docs/Web/Events/стримится /ru/docs/Web/API/HTMLMediaElement/seeking_event +/ru/docs/Web/Guide/AJAX /ru/docs/conflicting/Learn/JavaScript/Client-side_web_APIs/Fetching_data /ru/docs/Web/Guide/AJAX/Getting_Started /ru/docs/conflicting/Web/Guide/AJAX /ru/docs/Web/Guide/AJAX/С_чего_начать /ru/docs/conflicting/Web/Guide/AJAX /ru/docs/Web/Guide/CSS/Getting_started/SVG_и_CSS /ru/docs/Web/SVG/Tutorial/SVG_and_CSS @@ -872,8 +874,8 @@ /ru/docs/Web/JavaScript/Reference/Global_Objects/WeakMap/clear /ru/docs/conflicting/Web/JavaScript/Reference/Deprecated_and_obsolete_features /ru/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly /ru/docs/WebAssembly/JavaScript_interface /ru/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Table /ru/docs/WebAssembly/JavaScript_interface/Table -/ru/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compile /ru/docs/WebAssembly/JavaScript_interface/compile -/ru/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compileStreaming /ru/docs/WebAssembly/JavaScript_interface/compileStreaming +/ru/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compile /ru/docs/WebAssembly/JavaScript_interface/compile_static +/ru/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compileStreaming /ru/docs/WebAssembly/JavaScript_interface/compileStreaming_static /ru/docs/Web/JavaScript/Reference/Global_Objects/null /ru/docs/Web/JavaScript/Reference/Operators/null /ru/docs/Web/JavaScript/Reference/Global_Objects/uneval /ru/docs/conflicting/Web/JavaScript/Reference/Global_Objects /ru/docs/Web/JavaScript/Reference/Methods_Index /ru/docs/Web/JavaScript/Reference @@ -988,6 +990,8 @@ /ru/docs/Web/Манифест/short_name /ru/docs/Web/Manifest/short_name /ru/docs/Web/Манифест/start_url /ru/docs/Web/Manifest/start_url /ru/docs/Web/Манифест/theme_color /ru/docs/Web/Manifest/theme_color +/ru/docs/WebAssembly/JavaScript_interface/compile /ru/docs/WebAssembly/JavaScript_interface/compile_static +/ru/docs/WebAssembly/JavaScript_interface/compileStreaming /ru/docs/WebAssembly/JavaScript_interface/compileStreaming_static /ru/docs/WebGL /ru/docs/Web/API/WebGL_API /ru/docs/WebGL/Using_shaders_to_apply_color_in_WebGL /ru/docs/Web/API/WebGL_API/Tutorial/Using_shaders_to_apply_color_in_WebGL /ru/docs/WebSockets /ru/docs/Web/API/WebSockets_API diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json index 82fd3d3294c8b0..7c4b955df57b46 100644 --- a/files/ru/_wikihistory.json +++ b/files/ru/_wikihistory.json @@ -7362,10 +7362,6 @@ "modified": "2020-10-15T22:12:17.873Z", "contributors": ["Mitrr", "ShantyHoz"] }, - "Web/API/Window/pageYOffset": { - "modified": "2020-10-15T22:28:25.886Z", - "contributors": ["anima-dev"] - }, "Web/API/Window/parent": { "modified": "2019-03-23T22:52:14.067Z", "contributors": ["skip405", "olehrgf"] @@ -9836,22 +9832,6 @@ "Sheppy" ] }, - "Web/Guide/AJAX": { - "modified": "2020-03-06T17:23:15.361Z", - "contributors": [ - "bulatDev", - "korjjik87", - "chrisdavidmills", - "Sky_Fox", - "Megapotz", - "Kavkazsk", - "Summit677", - "Kwinto", - "Dionys", - "Woodroof", - "Zhuravlik" - ] - }, "Web/Guide/API": { "modified": "2019-09-11T09:35:03.457Z", "contributors": ["SphinxKnight", "BychekRU", "Sheppy"] @@ -16033,12 +16013,12 @@ "modified": "2020-10-15T22:28:03.728Z", "contributors": ["amuzalevskiy"] }, - "WebAssembly/JavaScript_interface/compile": { - "modified": "2020-10-15T22:05:22.747Z", + "WebAssembly/JavaScript_interface/compileStreaming_static": { + "modified": "2020-10-15T22:05:24.687Z", "contributors": ["warsan"] }, - "WebAssembly/JavaScript_interface/compileStreaming": { - "modified": "2020-10-15T22:05:24.687Z", + "WebAssembly/JavaScript_interface/compile_static": { + "modified": "2020-10-15T22:05:22.747Z", "contributors": ["warsan"] }, "WebAssembly/Loading_and_running": { @@ -16129,6 +16109,22 @@ "modified": "2020-12-02T05:41:10.583Z", "contributors": ["haltaction", "KrasnovaM", "snayp"] }, + "conflicting/Learn/JavaScript/Client-side_web_APIs/Fetching_data": { + "modified": "2020-03-06T17:23:15.361Z", + "contributors": [ + "bulatDev", + "korjjik87", + "chrisdavidmills", + "Sky_Fox", + "Megapotz", + "Kavkazsk", + "Summit677", + "Kwinto", + "Dionys", + "Woodroof", + "Zhuravlik" + ] + }, "conflicting/Learn/JavaScript/Objects": { "modified": "2019-06-04T15:16:30.349Z", "contributors": [ @@ -16400,6 +16396,10 @@ "modified": "2020-10-15T21:34:09.985Z", "contributors": ["hisbvdis", "stary71", "alexismaster"] }, + "conflicting/Web/API/Window/scrollY": { + "modified": "2020-10-15T22:28:25.886Z", + "contributors": ["anima-dev"] + }, "conflicting/Web/API/WindowOrWorkerGlobalScope": { "modified": "2019-03-23T22:50:51.451Z", "contributors": ["teoli"] diff --git a/files/ru/web/guide/ajax/index.md b/files/ru/conflicting/learn/javascript/client-side_web_apis/fetching_data/index.md similarity index 97% rename from files/ru/web/guide/ajax/index.md rename to files/ru/conflicting/learn/javascript/client-side_web_apis/fetching_data/index.md index ed162b108b3669..ee9fa7e7c9e7d9 100644 --- a/files/ru/web/guide/ajax/index.md +++ b/files/ru/conflicting/learn/javascript/client-side_web_apis/fetching_data/index.md @@ -1,6 +1,7 @@ --- title: AJAX -slug: Web/Guide/AJAX +slug: conflicting/Learn/JavaScript/Client-side_web_APIs/Fetching_data +original_slug: Web/Guide/AJAX --- ## Введение в AJAX diff --git a/files/ru/web/api/window/pageyoffset/index.md b/files/ru/conflicting/web/api/window/scrolly/index.md similarity index 99% rename from files/ru/web/api/window/pageyoffset/index.md rename to files/ru/conflicting/web/api/window/scrolly/index.md index 40df74d7746921..d44c69ad1f04ae 100644 --- a/files/ru/web/api/window/pageyoffset/index.md +++ b/files/ru/conflicting/web/api/window/scrolly/index.md @@ -1,6 +1,7 @@ --- title: Window.pageYOffset -slug: Web/API/Window/pageYOffset +slug: conflicting/Web/API/Window/scrollY +original_slug: Web/API/Window/pageYOffset --- {{ APIRef("CSSOM View") }} diff --git a/files/ru/webassembly/javascript_interface/compile/index.md b/files/ru/webassembly/javascript_interface/compile_static/index.md similarity index 96% rename from files/ru/webassembly/javascript_interface/compile/index.md rename to files/ru/webassembly/javascript_interface/compile_static/index.md index 1a1ff8f6dffc67..682235200c0dfd 100644 --- a/files/ru/webassembly/javascript_interface/compile/index.md +++ b/files/ru/webassembly/javascript_interface/compile_static/index.md @@ -1,6 +1,7 @@ --- title: WebAssembly.compile() -slug: WebAssembly/JavaScript_interface/compile +slug: WebAssembly/JavaScript_interface/compile_static +original_slug: WebAssembly/JavaScript_interface/compile --- {{WebAssemblySidebar}} diff --git a/files/ru/webassembly/javascript_interface/compilestreaming/index.md b/files/ru/webassembly/javascript_interface/compilestreaming_static/index.md similarity index 96% rename from files/ru/webassembly/javascript_interface/compilestreaming/index.md rename to files/ru/webassembly/javascript_interface/compilestreaming_static/index.md index 7171881fc2c5f1..bbab2b65105021 100644 --- a/files/ru/webassembly/javascript_interface/compilestreaming/index.md +++ b/files/ru/webassembly/javascript_interface/compilestreaming_static/index.md @@ -1,6 +1,7 @@ --- title: WebAssembly.compileStreaming() -slug: WebAssembly/JavaScript_interface/compileStreaming +slug: WebAssembly/JavaScript_interface/compileStreaming_static +original_slug: WebAssembly/JavaScript_interface/compileStreaming --- {{WebAssemblySidebar}}