aboutsummaryrefslogtreecommitdiff
path: root/files/ru
diff options
context:
space:
mode:
Diffstat (limited to 'files/ru')
-rw-r--r--files/ru/_redirects.txt3
-rw-r--r--files/ru/_wikihistory.json41
-rw-r--r--files/ru/conflicting/web/api/uievent/which/index.html (renamed from files/ru/web/api/mouseevent/which/index.html)3
-rw-r--r--files/ru/conflicting/web/javascript/reference/global_objects/string/index.html (renamed from files/ru/web/api/bytestring/index.html)3
-rw-r--r--files/ru/web/api/uievent/which/index.html (renamed from files/ru/web/api/keyboardevent/which/index.html)3
5 files changed, 24 insertions, 29 deletions
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index 8dbb1dd636..e9d4e75587 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -301,6 +301,7 @@
/ru/docs/Web/API/AudioContext/createPanner /ru/docs/Web/API/BaseAudioContext/createPanner
/ru/docs/Web/API/AudioContext/currentTime /ru/docs/Web/API/BaseAudioContext/currentTime
/ru/docs/Web/API/AudioContext/decodeAudioData /ru/docs/Web/API/BaseAudioContext/decodeAudioData
+/ru/docs/Web/API/ByteString /ru/docs/conflicting/Web/JavaScript/Reference/Global_Objects/String
/ru/docs/Web/API/CSS_Object_Model/ориентация_экрана /ru/docs/Web/API/CSS_Object_Model/Managing_screen_orientation
/ru/docs/Web/API/Canvas_API/Tutorial/Использование_изображений /ru/docs/Web/API/Canvas_API/Tutorial/Using_images
/ru/docs/Web/API/Canvas_API/Tutorial/Композиции /ru/docs/Web/API/Canvas_API/Tutorial/Compositing
@@ -340,6 +341,8 @@
/ru/docs/Web/API/HTMLHyperlinkElementUtils/toString /ru/docs/Web/API/HTMLAnchorElement/toString
/ru/docs/Web/API/HTMLHyperlinkElementUtils/username /ru/docs/Web/API/HTMLAnchorElement/username
/ru/docs/Web/API/HTMLImageElement.Image /ru/docs/Web/API/HTMLImageElement/Image
+/ru/docs/Web/API/KeyboardEvent/which /ru/docs/Web/API/UIEvent/which
+/ru/docs/Web/API/MouseEvent/which /ru/docs/conflicting/Web/API/UIEvent/which
/ru/docs/Web/API/NetworkInformation/connection /ru/docs/Web/API/Navigator/connection
/ru/docs/Web/API/Node.appendChild /ru/docs/Web/API/Node/appendChild
/ru/docs/Web/API/Node.contains /ru/docs/Web/API/Node/contains
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index 633ebd6995..388b670bc8 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -5730,13 +5730,6 @@
"sh7dm"
]
},
- "Web/API/ByteString": {
- "modified": "2019-09-13T04:40:19.326Z",
- "contributors": [
- "ekirpichyov",
- "opereverzeva"
- ]
- },
"Web/API/CDATASection": {
"modified": "2020-10-15T22:08:24.955Z",
"contributors": [
@@ -9241,12 +9234,6 @@
"Tvortsa"
]
},
- "Web/API/KeyboardEvent/which": {
- "modified": "2020-10-15T22:21:03.336Z",
- "contributors": [
- "Dzvonek"
- ]
- },
"Web/API/Location": {
"modified": "2019-08-09T02:31:05.855Z",
"contributors": [
@@ -9493,12 +9480,6 @@
"insafski"
]
},
- "Web/API/MouseEvent/which": {
- "modified": "2020-10-15T22:15:09.701Z",
- "contributors": [
- "InoY"
- ]
- },
"Web/API/MutationObserver": {
"modified": "2020-10-15T21:47:37.351Z",
"contributors": [
@@ -10517,6 +10498,12 @@
"idushii"
]
},
+ "Web/API/UIEvent/which": {
+ "modified": "2020-10-15T22:21:03.336Z",
+ "contributors": [
+ "Dzvonek"
+ ]
+ },
"Web/API/URL": {
"modified": "2020-10-18T22:13:20.099Z",
"contributors": [
@@ -24246,6 +24233,12 @@
"Liubava77"
]
},
+ "conflicting/Web/API/UIEvent/which": {
+ "modified": "2020-10-15T22:15:09.701Z",
+ "contributors": [
+ "InoY"
+ ]
+ },
"conflicting/Web/API/WebRTC_API": {
"modified": "2019-03-23T22:34:55.398Z",
"contributors": [
@@ -24556,14 +24549,10 @@
]
},
"conflicting/Web/JavaScript/Reference/Global_Objects/String": {
- "modified": "2019-08-27T15:11:15.337Z",
+ "modified": "2019-09-13T04:40:19.326Z",
"contributors": [
- "Yialo",
- "EugeneTarasenko",
- "ukrlex01",
- "arctic-hare",
- "webnarmin",
- "Mingun"
+ "ekirpichyov",
+ "opereverzeva"
]
},
"conflicting/Web/JavaScript/Reference/Global_Objects/Symbol": {
diff --git a/files/ru/web/api/mouseevent/which/index.html b/files/ru/conflicting/web/api/uievent/which/index.html
index f2a4a8cf09..97f0afc8ad 100644
--- a/files/ru/web/api/mouseevent/which/index.html
+++ b/files/ru/conflicting/web/api/uievent/which/index.html
@@ -1,10 +1,11 @@
---
title: MouseEvent.which
-slug: Web/API/MouseEvent/which
+slug: conflicting/Web/API/UIEvent/which
tags:
- API
- "События\_DOM"
translation_of: Web/API/MouseEvent/which
+original_slug: Web/API/MouseEvent/which
---
<p>{{APIRef("DOM Events")}}</p>
diff --git a/files/ru/web/api/bytestring/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/string/index.html
index 01993390ee..bbf48536b8 100644
--- a/files/ru/web/api/bytestring/index.html
+++ b/files/ru/conflicting/web/javascript/reference/global_objects/string/index.html
@@ -1,9 +1,10 @@
---
title: ByteString
-slug: Web/API/ByteString
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/String
tags:
- Строки
translation_of: Web/API/ByteString
+original_slug: Web/API/ByteString
---
<div>{{APIRef("DOM")}}</div>
diff --git a/files/ru/web/api/keyboardevent/which/index.html b/files/ru/web/api/uievent/which/index.html
index 0b78a32ab4..3c2fc530cc 100644
--- a/files/ru/web/api/keyboardevent/which/index.html
+++ b/files/ru/web/api/uievent/which/index.html
@@ -1,6 +1,6 @@
---
title: KeyboardEvent.which
-slug: Web/API/KeyboardEvent/which
+slug: Web/API/UIEvent/which
tags:
- API
- DOM
@@ -8,6 +8,7 @@ tags:
- Property
- Reference
translation_of: Web/API/KeyboardEvent/which
+original_slug: Web/API/KeyboardEvent/which
---
<div>{{APIRef ("События DOM")}} {{Deprecated_header}}<br>
Свойство which только для чтения интерфейса {{domxref ("KeyboardEvent")}} возвращает числовой код клавиши нажатой клавиши или код символа (charCode) для нажатой буквенно-цифровой клавиши.</div>