diff options
-rw-r--r-- | files/de/_redirects.txt | 1 | ||||
-rw-r--r-- | files/de/_wikihistory.json | 14 | ||||
-rw-r--r-- | files/de/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/de/learn/javascript/objects/object-oriented_js/index.html) | 3 | ||||
-rw-r--r-- | files/es/_redirects.txt | 2 | ||||
-rw-r--r-- | files/es/_wikihistory.json | 40 | ||||
-rw-r--r-- | files/es/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/es/learn/javascript/objects/object-oriented_js/index.html) | 5 | ||||
-rw-r--r-- | files/es/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/es/learn/javascript/objects/inheritance/index.html) | 3 | ||||
-rw-r--r-- | files/fr/_redirects.txt | 6 | ||||
-rw-r--r-- | files/fr/_wikihistory.json | 34 | ||||
-rw-r--r-- | files/fr/conflicting/learn/javascript/objects/classes_in_javascript/index.md (renamed from files/fr/learn/javascript/objects/object-oriented_js/index.md) | 4 | ||||
-rw-r--r-- | files/fr/learn/javascript/objects/classes_in_javascript/index.md (renamed from files/fr/learn/javascript/objects/inheritance/index.md) | 4 | ||||
-rw-r--r-- | files/ja/_redirects.txt | 4 | ||||
-rw-r--r-- | files/ja/_wikihistory.json | 28 | ||||
-rw-r--r-- | files/ja/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ja/learn/javascript/objects/object-oriented_js/index.html) | 3 | ||||
-rw-r--r-- | files/ja/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ja/learn/javascript/objects/inheritance/index.html) | 5 | ||||
-rw-r--r-- | files/ko/_redirects.txt | 2 | ||||
-rw-r--r-- | files/ko/_wikihistory.json | 20 | ||||
-rw-r--r-- | files/ko/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ko/learn/javascript/objects/object-oriented_js/index.html) | 5 | ||||
-rw-r--r-- | files/ko/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ko/learn/javascript/objects/inheritance/index.html) | 3 | ||||
-rw-r--r-- | files/pt-br/_redirects.txt | 6 | ||||
-rw-r--r-- | files/pt-br/_wikihistory.json | 18 | ||||
-rw-r--r-- | files/pt-br/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/pt-br/learn/javascript/objects/object-oriented_js/index.html) | 4 | ||||
-rw-r--r-- | files/pt-br/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/pt-br/learn/javascript/objects/inheritance/index.html) | 4 | ||||
-rw-r--r-- | files/ru/_redirects.txt | 6 | ||||
-rw-r--r-- | files/ru/_wikihistory.json | 44 | ||||
-rw-r--r-- | files/ru/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ru/learn/javascript/objects/object-oriented_js/index.html) | 4 | ||||
-rw-r--r-- | files/ru/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ru/learn/javascript/objects/inheritance/index.html) | 4 | ||||
-rw-r--r-- | files/zh-cn/_redirects.txt | 2 | ||||
-rw-r--r-- | files/zh-cn/_wikihistory.json | 52 | ||||
-rw-r--r-- | files/zh-cn/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/zh-cn/learn/javascript/objects/object-oriented_js/index.html) | 3 | ||||
-rw-r--r-- | files/zh-cn/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/zh-cn/learn/javascript/objects/inheritance/index.html) | 3 | ||||
-rw-r--r-- | files/zh-tw/_redirects.txt | 2 | ||||
-rw-r--r-- | files/zh-tw/_wikihistory.json | 24 | ||||
-rw-r--r-- | files/zh-tw/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/zh-tw/learn/javascript/objects/object-oriented_js/index.html) | 3 | ||||
-rw-r--r-- | files/zh-tw/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/zh-tw/learn/javascript/objects/inheritance/index.html) | 3 |
35 files changed, 198 insertions, 170 deletions
diff --git a/files/de/_redirects.txt b/files/de/_redirects.txt index c7f0e18eae..1909a749bb 100644 --- a/files/de/_redirects.txt +++ b/files/de/_redirects.txt @@ -377,6 +377,7 @@ /de/docs/Learn/JavaScript/First_steps/Erster_Blick /de/docs/Learn/JavaScript/First_steps/A_first_splash /de/docs/Learn/JavaScript/First_steps/Was_ist_JavaScript /de/docs/Learn/JavaScript/First_steps/What_is_JavaScript /de/docs/Learn/JavaScript/First_steps/lustige_geschichten_generator /de/docs/Learn/JavaScript/First_steps/Silly_story_generator +/de/docs/Learn/JavaScript/Objects/Object-oriented_JS /de/docs/Learn/JavaScript/Objects/Classes_in_JavaScript /de/docs/Learn/Server-side/Erste_Schritte /de/docs/Learn/Server-side/First_steps /de/docs/Lokalisierung /de/docs/Glossary/Localization /de/docs/MDN/Contribute/Structures /de/docs/MDN/Structures diff --git a/files/de/_wikihistory.json b/files/de/_wikihistory.json index 815ea683ef..85a1b47a83 100644 --- a/files/de/_wikihistory.json +++ b/files/de/_wikihistory.json @@ -1454,6 +1454,13 @@ "22tcp" ] }, + "Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-07-16T22:32:04.669Z", + "contributors": [ + "Timbuktu1982", + "bluefor2" + ] + }, "Learn/JavaScript/Objects/JSON": { "modified": "2020-07-16T22:32:24.377Z", "contributors": [ @@ -1461,13 +1468,6 @@ "DirkMassmann" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-07-16T22:32:04.669Z", - "contributors": [ - "Timbuktu1982", - "bluefor2" - ] - }, "Learn/JavaScript/Objects/Object_prototypes": { "modified": "2020-07-16T22:32:18.828Z", "contributors": [ diff --git a/files/de/learn/javascript/objects/object-oriented_js/index.html b/files/de/learn/javascript/objects/classes_in_javascript/index.html index b4229a8058..9a320da8d9 100644 --- a/files/de/learn/javascript/objects/object-oriented_js/index.html +++ b/files/de/learn/javascript/objects/classes_in_javascript/index.html @@ -1,6 +1,6 @@ --- title: Objektorientiertes JavaScript für Beginner -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Anfänger - Artikel @@ -16,6 +16,7 @@ tags: - Objektorientiert - codescripting translation_of: Learn/JavaScript/Objects/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt index 2c0faa8c5e..bc65d530bf 100644 --- a/files/es/_redirects.txt +++ b/files/es/_redirects.txt @@ -1187,6 +1187,8 @@ /es/docs/Learn/JavaScript/First_steps/Prueba_tus_habilidades:_Strings /es/docs/Learn/JavaScript/First_steps/Test_your_skills:_Strings /es/docs/Learn/JavaScript/First_steps/Qué_es_JavaScript /es/docs/Learn/JavaScript/First_steps/What_is_JavaScript /es/docs/Learn/JavaScript/Objects/Ejercicio_práctico_de_construcción_de_objetos /es/docs/Learn/JavaScript/Objects/Object_building_practice +/es/docs/Learn/JavaScript/Objects/Inheritance /es/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/es/docs/Learn/JavaScript/Objects/Object-oriented_JS /es/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /es/docs/Learn/Server-side/Django/Introducción /es/docs/Learn/Server-side/Django/Introduction /es/docs/Learn/Server-side/Primeros_pasos /es/docs/Learn/Server-side/First_steps /es/docs/Learn/Server-side/Primeros_pasos/Introducción /es/docs/Learn/Server-side/First_steps/Introduction diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json index dc0fdd2b06..889610fe22 100644 --- a/files/es/_wikihistory.json +++ b/files/es/_wikihistory.json @@ -3249,7 +3249,7 @@ "kevin-loal98" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-07-28T01:53:21.821Z", "contributors": [ "Fernando-Funes", @@ -3268,25 +3268,6 @@ "Enesimus" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-08-08T09:41:13.386Z", - "contributors": [ - "Nachec", - "andyesp", - "Fernando-Funes", - "jhonarielgj", - "rimbener", - "ReneAG", - "EnekoOdoo", - "ivanagui2", - "cristianmarquezp", - "djdouta", - "paulaco", - "martinGerez", - "anyruizd", - "Michelangeur" - ] - }, "Learn/JavaScript/Objects/Object_building_practice": { "modified": "2020-07-16T22:32:30.877Z", "contributors": [ @@ -21214,6 +21195,25 @@ "StripTM" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-08-08T09:41:13.386Z", + "contributors": [ + "Nachec", + "andyesp", + "Fernando-Funes", + "jhonarielgj", + "rimbener", + "ReneAG", + "EnekoOdoo", + "ivanagui2", + "cristianmarquezp", + "djdouta", + "paulaco", + "martinGerez", + "anyruizd", + "Michelangeur" + ] + }, "conflicting/MDN/Contribute/Getting_started": { "modified": "2019-01-16T18:56:38.941Z", "contributors": [ diff --git a/files/es/learn/javascript/objects/object-oriented_js/index.html b/files/es/conflicting/learn/javascript/objects/classes_in_javascript/index.html index 5eb023c685..8cafe5c160 100644 --- a/files/es/learn/javascript/objects/object-oriented_js/index.html +++ b/files/es/conflicting/learn/javascript/objects/classes_in_javascript/index.html @@ -1,6 +1,6 @@ --- title: JavaScript orientado a objetos para principiantes -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Aprender - Artículo @@ -18,8 +18,9 @@ tags: - Programación orientada a objetos - instance - instanciar - - 'l10n:priority' + - l10n:priority translation_of: Learn/JavaScript/Objects/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/es/learn/javascript/objects/inheritance/index.html b/files/es/learn/javascript/objects/classes_in_javascript/index.html index e1cbba42da..2af15e98bf 100644 --- a/files/es/learn/javascript/objects/inheritance/index.html +++ b/files/es/learn/javascript/objects/classes_in_javascript/index.html @@ -1,7 +1,8 @@ --- title: Herencia en JavaScript -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript translation_of: Learn/JavaScript/Objects/Inheritance +original_slug: Learn/JavaScript/Objects/Inheritance --- <div>{{LearnSidebar}}</div> diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt index 4f52dc802f..fd52f541c3 100644 --- a/files/fr/_redirects.txt +++ b/files/fr/_redirects.txt @@ -3001,8 +3001,10 @@ /fr/docs/Learn/JavaScript/First_steps/methode_chaine_utile /fr/docs/Learn/JavaScript/First_steps/Useful_string_methods /fr/docs/Learn/JavaScript/First_steps/tableaux /fr/docs/Learn/JavaScript/First_steps/Arrays /fr/docs/Learn/JavaScript/Objects/Ajouter_des_fonctionnalités_à_notre_démo_de_balles_rebondissantes /fr/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features -/fr/docs/Learn/JavaScript/Objects/Heritage /fr/docs/Learn/JavaScript/Objects/Inheritance -/fr/docs/Learn/JavaScript/Objects/JS_orienté-objet /fr/docs/Learn/JavaScript/Objects/Object-oriented_JS +/fr/docs/Learn/JavaScript/Objects/Heritage /fr/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/fr/docs/Learn/JavaScript/Objects/Inheritance /fr/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/fr/docs/Learn/JavaScript/Objects/JS_orienté-objet /fr/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript +/fr/docs/Learn/JavaScript/Objects/Object-oriented_JS /fr/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /fr/docs/Learn/JavaScript/Objects/Prototypes_Objet /fr/docs/Learn/JavaScript/Objects/Object_prototypes /fr/docs/Learn/JavaScript/Objects/la_construction_d_objet_en_pratique /fr/docs/Learn/JavaScript/Objects/Object_building_practice /fr/docs/Learn/Performance/Populating_the_page:_how_browsers_work /fr/docs/Web/Performance/How_browsers_work diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json index 14fc7b1eff..31db3f6c96 100644 --- a/files/fr/_wikihistory.json +++ b/files/fr/_wikihistory.json @@ -5125,7 +5125,7 @@ "mouffy" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-07-16T22:32:13.707Z", "contributors": [ "franssu", @@ -5151,22 +5151,6 @@ "darthyoh" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-07-16T22:32:05.419Z", - "contributors": [ - "grandoc", - "FloppyJunior", - "vacarme", - "zoora", - "Jetinho", - "elWombator", - "manuwhat", - "antoninha", - "LDCL", - "Alpha", - "SphinxKnight" - ] - }, "Learn/JavaScript/Objects/Object_building_practice": { "modified": "2020-07-16T22:32:31.265Z", "contributors": [ @@ -42753,6 +42737,22 @@ "Goofy" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-07-16T22:32:05.419Z", + "contributors": [ + "grandoc", + "FloppyJunior", + "vacarme", + "zoora", + "Jetinho", + "elWombator", + "manuwhat", + "antoninha", + "LDCL", + "Alpha", + "SphinxKnight" + ] + }, "conflicting/Learn_370bfb0fa23e42f4384f010341852c43": { "modified": "2020-07-16T22:33:41.155Z", "contributors": [ diff --git a/files/fr/learn/javascript/objects/object-oriented_js/index.md b/files/fr/conflicting/learn/javascript/objects/classes_in_javascript/index.md index be3d5ffacd..61923716ba 100644 --- a/files/fr/learn/javascript/objects/object-oriented_js/index.md +++ b/files/fr/conflicting/learn/javascript/objects/classes_in_javascript/index.md @@ -1,6 +1,6 @@ --- title: Le JavaScript orienté objet pour débutants -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Apprendre - Débutant @@ -10,7 +10,7 @@ tags: - OOP - POO translation_of: Learn/JavaScript/Objects/Object-oriented_JS -original_slug: Learn/JavaScript/Objects/JS_orienté-objet +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- {{LearnSidebar}}{{PreviousMenuNext("Learn/JavaScript/Objects/Basics", "Learn/JavaScript/Objects/Object_prototypes", "Learn/JavaScript/Objects")}} diff --git a/files/fr/learn/javascript/objects/inheritance/index.md b/files/fr/learn/javascript/objects/classes_in_javascript/index.md index 89668811fa..29263128cc 100644 --- a/files/fr/learn/javascript/objects/inheritance/index.md +++ b/files/fr/learn/javascript/objects/classes_in_javascript/index.md @@ -1,6 +1,6 @@ --- title: L'héritage au sein de JavaScript -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Apprendre - Article @@ -12,7 +12,7 @@ tags: - Programmation orientée objet - Prototype translation_of: Learn/JavaScript/Objects/Inheritance -original_slug: Learn/JavaScript/Objects/Heritage +original_slug: Learn/JavaScript/Objects/Inheritance --- {{LearnSidebar}} diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index 40ffd7a36e..e511d50334 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -2693,7 +2693,9 @@ /ja/docs/Learn/HTML/Forms/Your_first_HTML_form /ja/docs/Learn/Forms/Your_first_form /ja/docs/Learn/HTML/Forms/Your_first_HTML_form/Example /ja/docs/Learn/Forms/Your_first_form/Example /ja/docs/Learn/HTML/Introduction_to_HTML/高度なテキスト成型 /ja/docs/Learn/HTML/Introduction_to_HTML/Advanced_text_formatting -/ja/docs/Learn/JavaScript/Objects/継承 /ja/docs/Learn/JavaScript/Objects/Inheritance +/ja/docs/Learn/JavaScript/Objects/Inheritance /ja/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/ja/docs/Learn/JavaScript/Objects/Object-oriented_JS /ja/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript +/ja/docs/Learn/JavaScript/Objects/継承 /ja/docs/Learn/JavaScript/Objects/Classes_in_JavaScript /ja/docs/Learn/JavaScript/非同期 /ja/docs/Learn/JavaScript/Asynchronous /ja/docs/Learn/Performance/Populating_the_page:_how_browsers_work /ja/docs/Web/Performance/How_browsers_work /ja/docs/Learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry /ja/docs/orphaned/Learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json index b55beced95..673d001d2e 100644 --- a/files/ja/_wikihistory.json +++ b/files/ja/_wikihistory.json @@ -5531,7 +5531,7 @@ "chameleonhead" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-12-12T19:47:14.522Z", "contributors": [ "eldesh", @@ -5554,19 +5554,6 @@ "r-tamura" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-12-06T14:17:48.495Z", - "contributors": [ - "eldesh", - "silverskyvicto", - "mfuji09", - "JuthaDDA", - "Uemmra3", - "hamasaki", - "kenji-yamasaki", - "sii" - ] - }, "Learn/JavaScript/Objects/Object_building_practice": { "modified": "2020-12-07T11:55:33.524Z", "contributors": [ @@ -48449,6 +48436,19 @@ "momdo" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-12-06T14:17:48.495Z", + "contributors": [ + "eldesh", + "silverskyvicto", + "mfuji09", + "JuthaDDA", + "Uemmra3", + "hamasaki", + "kenji-yamasaki", + "sii" + ] + }, "conflicting/MDN/Contribute/Markdown_in_MDN": { "modified": "2020-09-30T15:30:25.061Z", "contributors": [ diff --git a/files/ja/learn/javascript/objects/object-oriented_js/index.html b/files/ja/conflicting/learn/javascript/objects/classes_in_javascript/index.html index 387400f5b0..66e8b522d0 100644 --- a/files/ja/learn/javascript/objects/object-oriented_js/index.html +++ b/files/ja/conflicting/learn/javascript/objects/classes_in_javascript/index.html @@ -1,6 +1,6 @@ --- title: 初心者のためのオブジェクト指向 JavaScript -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Beginner - Create @@ -12,6 +12,7 @@ tags: - 学習 - 記事 translation_of: Learn/JavaScript/Objects/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/ja/learn/javascript/objects/inheritance/index.html b/files/ja/learn/javascript/objects/classes_in_javascript/index.html index 2964fbe786..b0802b7072 100644 --- a/files/ja/learn/javascript/objects/inheritance/index.html +++ b/files/ja/learn/javascript/objects/classes_in_javascript/index.html @@ -1,6 +1,6 @@ --- title: JavaScript での継承 -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Article - CodingScripting @@ -10,10 +10,11 @@ tags: - OOP - Object - Prototype - - 'l10n:priority' + - l10n:priority - 初心者 - 学習 translation_of: Learn/JavaScript/Objects/Inheritance +original_slug: Learn/JavaScript/Objects/Inheritance --- <div>{{LearnSidebar}}</div> diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt index 05d11bdcbd..8769ccde13 100644 --- a/files/ko/_redirects.txt +++ b/files/ko/_redirects.txt @@ -314,6 +314,8 @@ /ko/docs/Learn/HTML/Howto/데이터_속성_사용하기 /ko/docs/Learn/HTML/Howto/Use_data_attributes /ko/docs/Learn/HTML/Multimedia_and_embedding/ideo_and_audio_content /ko/docs/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content /ko/docs/Learn/JavaScript/Building_blocks/조건문 /ko/docs/Learn/JavaScript/Building_blocks/conditionals +/ko/docs/Learn/JavaScript/Objects/Inheritance /ko/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/ko/docs/Learn/JavaScript/Objects/Object-oriented_JS /ko/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /ko/docs/Learn/JavaScript/Objects/얼마나_이해했는지_확인해보자:_JSON /ko/docs/Learn/JavaScript/Objects/Test_your_skills:_JSON /ko/docs/Learn/Server-side/Express_Nodejs/개발_환경 /ko/docs/Learn/Server-side/Express_Nodejs/development_environment /ko/docs/Learn/Server-side/Express_Nodejs/스켈레톤_웹사이트 /ko/docs/Learn/Server-side/Express_Nodejs/skeleton_website diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json index ddd5aa5b31..b4a8b6a3ff 100644 --- a/files/ko/_wikihistory.json +++ b/files/ko/_wikihistory.json @@ -2144,7 +2144,7 @@ "dsma73" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-07-16T22:32:15.138Z", "contributors": [ "youngdeok", @@ -2164,15 +2164,6 @@ "ahnzaz" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-07-16T22:32:06.697Z", - "contributors": [ - "alattalatta", - "beowolf9", - "lunarlit", - "dsma73" - ] - }, "Learn/JavaScript/Objects/Object_prototypes": { "modified": "2020-07-16T22:32:21.572Z", "contributors": [ @@ -17476,6 +17467,15 @@ "JaehaAhn" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-07-16T22:32:06.697Z", + "contributors": [ + "alattalatta", + "beowolf9", + "lunarlit", + "dsma73" + ] + }, "conflicting/MDN/Tools": { "modified": "2019-01-16T20:50:22.654Z", "contributors": [ diff --git a/files/ko/learn/javascript/objects/object-oriented_js/index.html b/files/ko/conflicting/learn/javascript/objects/classes_in_javascript/index.html index df1bf59c17..bfee97a562 100644 --- a/files/ko/learn/javascript/objects/object-oriented_js/index.html +++ b/files/ko/conflicting/learn/javascript/objects/classes_in_javascript/index.html @@ -1,14 +1,15 @@ --- title: Object-oriented JavaScript for beginners -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Article - Beginner - CodingScripting - JavaScript - Learn - - 'l10n:priority' + - l10n:priority translation_of: Learn/JavaScript/Objects/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/ko/learn/javascript/objects/inheritance/index.html b/files/ko/learn/javascript/objects/classes_in_javascript/index.html index 72a2302d15..0549a416ef 100644 --- a/files/ko/learn/javascript/objects/inheritance/index.html +++ b/files/ko/learn/javascript/objects/classes_in_javascript/index.html @@ -1,7 +1,8 @@ --- title: Inheritance in JavaScript -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript translation_of: Learn/JavaScript/Objects/Inheritance +original_slug: Learn/JavaScript/Objects/Inheritance --- <div>{{LearnSidebar}}</div> diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt index da89c57846..82705e2d46 100644 --- a/files/pt-br/_redirects.txt +++ b/files/pt-br/_redirects.txt @@ -69,9 +69,9 @@ /pt-BR/docs/Aprender/JavaScript/Objetos /pt-BR/docs/Learn/JavaScript/Objects /pt-BR/docs/Aprender/JavaScript/Objetos/Adding_bouncing_balls_features /pt-BR/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features /pt-BR/docs/Aprender/JavaScript/Objetos/Básico /pt-BR/docs/Learn/JavaScript/Objects/Basics -/pt-BR/docs/Aprender/JavaScript/Objetos/Herança /pt-BR/docs/Learn/JavaScript/Objects/Inheritance +/pt-BR/docs/Aprender/JavaScript/Objetos/Herança /pt-BR/docs/Learn/JavaScript/Objects/Classes_in_JavaScript /pt-BR/docs/Aprender/JavaScript/Objetos/JSON /pt-BR/docs/Learn/JavaScript/Objects/JSON -/pt-BR/docs/Aprender/JavaScript/Objetos/Object-oriented_JS /pt-BR/docs/Learn/JavaScript/Objects/Object-oriented_JS +/pt-BR/docs/Aprender/JavaScript/Objetos/Object-oriented_JS /pt-BR/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /pt-BR/docs/Aprender/JavaScript/Objetos/Object_building_practice /pt-BR/docs/Learn/JavaScript/Objects/Object_building_practice /pt-BR/docs/Aprender/JavaScript/Objetos/Object_prototypes /pt-BR/docs/Learn/JavaScript/Objects/Object_prototypes /pt-BR/docs/Aprender/Learning_and_getting_help /pt-BR/docs/Learn/Learning_and_getting_help @@ -399,6 +399,8 @@ /pt-BR/docs/Learn/JavaScript/First_steps/O_que_e_JavaScript /pt-BR/docs/Learn/JavaScript/First_steps/What_is_JavaScript /pt-BR/docs/Learn/JavaScript/First_steps/Teste_suas_habilidades:_variaveis /pt-BR/docs/Learn/JavaScript/First_steps/Test_your_skills:_variables /pt-BR/docs/Learn/JavaScript/First_steps/Variáveis /pt-BR/docs/Learn/JavaScript/First_steps/Variables +/pt-BR/docs/Learn/JavaScript/Objects/Inheritance /pt-BR/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/pt-BR/docs/Learn/JavaScript/Objects/Object-oriented_JS /pt-BR/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /pt-BR/docs/Learn/Server-side/Django/Hospedagem /pt-BR/docs/Learn/Server-side/Django/Deployment /pt-BR/docs/Learn/Server-side/Django/Introdução /pt-BR/docs/Learn/Server-side/Django/Introduction /pt-BR/docs/Learn/Server-side/Django/Sessões /pt-BR/docs/Learn/Server-side/Django/Sessions diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json index 638fa546c6..a742393df3 100644 --- a/files/pt-br/_wikihistory.json +++ b/files/pt-br/_wikihistory.json @@ -2328,7 +2328,7 @@ "webfelipemaia" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-07-16T22:32:15.784Z", "contributors": [ "WellingtonFR", @@ -2344,14 +2344,6 @@ "greysonf" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-07-16T22:32:07.136Z", - "contributors": [ - "rpizzolato", - "WellingtonFR", - "greysonf" - ] - }, "Learn/JavaScript/Objects/Object_building_practice": { "modified": "2020-07-16T22:32:32.103Z", "contributors": [ @@ -16318,6 +16310,14 @@ "augustowebd" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-07-16T22:32:07.136Z", + "contributors": [ + "rpizzolato", + "WellingtonFR", + "greysonf" + ] + }, "conflicting/MDN/Contribute/Getting_started": { "modified": "2019-03-23T23:38:18.895Z", "contributors": [ diff --git a/files/pt-br/learn/javascript/objects/object-oriented_js/index.html b/files/pt-br/conflicting/learn/javascript/objects/classes_in_javascript/index.html index ead7aaa74e..125287707b 100644 --- a/files/pt-br/learn/javascript/objects/object-oriented_js/index.html +++ b/files/pt-br/conflicting/learn/javascript/objects/classes_in_javascript/index.html @@ -1,8 +1,8 @@ --- title: JavaScript orientado a objetos para iniciantes -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript translation_of: Learn/JavaScript/Objects/Object-oriented_JS -original_slug: Aprender/JavaScript/Objetos/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/pt-br/learn/javascript/objects/inheritance/index.html b/files/pt-br/learn/javascript/objects/classes_in_javascript/index.html index 032e574d6e..7b144c91e0 100644 --- a/files/pt-br/learn/javascript/objects/inheritance/index.html +++ b/files/pt-br/learn/javascript/objects/classes_in_javascript/index.html @@ -1,8 +1,8 @@ --- title: Herança em JavaScript -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript translation_of: Learn/JavaScript/Objects/Inheritance -original_slug: Aprender/JavaScript/Objetos/Herança +original_slug: Learn/JavaScript/Objects/Inheritance --- <div>{{LearnSidebar}}</div> diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt index f32afa34e2..ad7a5e09bc 100644 --- a/files/ru/_redirects.txt +++ b/files/ru/_redirects.txt @@ -223,11 +223,13 @@ /ru/docs/Learn/How_the_Internet_works /ru/docs/Learn/Common_questions/How_does_the_Internet_work /ru/docs/Learn/JavaScript/Asynchronous/Таймауты_и_интервалы /ru/docs/Learn/JavaScript/Asynchronous/Timeouts_and_intervals /ru/docs/Learn/JavaScript/Building_blocks/События /ru/docs/Learn/JavaScript/Building_blocks/Events +/ru/docs/Learn/JavaScript/Objects/Inheritance /ru/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/ru/docs/Learn/JavaScript/Objects/Object-oriented_JS /ru/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /ru/docs/Learn/JavaScript/Объекты /ru/docs/Learn/JavaScript/Objects /ru/docs/Learn/JavaScript/Объекты/Adding_bouncing_balls_features /ru/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features -/ru/docs/Learn/JavaScript/Объекты/Inheritance /ru/docs/Learn/JavaScript/Objects/Inheritance +/ru/docs/Learn/JavaScript/Объекты/Inheritance /ru/docs/Learn/JavaScript/Objects/Classes_in_JavaScript /ru/docs/Learn/JavaScript/Объекты/JSON /ru/docs/Learn/JavaScript/Objects/JSON -/ru/docs/Learn/JavaScript/Объекты/Object-oriented_JS /ru/docs/Learn/JavaScript/Objects/Object-oriented_JS +/ru/docs/Learn/JavaScript/Объекты/Object-oriented_JS /ru/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /ru/docs/Learn/JavaScript/Объекты/Object_building_practice /ru/docs/Learn/JavaScript/Objects/Object_building_practice /ru/docs/Learn/JavaScript/Объекты/Object_prototypes /ru/docs/Learn/JavaScript/Objects/Object_prototypes /ru/docs/Learn/JavaScript/Объекты/Основы /ru/docs/Learn/JavaScript/Objects/Basics diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json index 7a042b1535..605e67f660 100644 --- a/files/ru/_wikihistory.json +++ b/files/ru/_wikihistory.json @@ -3582,7 +3582,7 @@ "superpuper32" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-10-17T04:55:20.992Z", "contributors": [ "raylyanway", @@ -3606,27 +3606,6 @@ "slychai85" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-11-28T15:15:40.063Z", - "contributors": [ - "Tartalon", - "Viatcheslav-Malahov", - "wind-of", - "Detrimon", - "BadLame", - "ConstantineZz", - "ellegre", - "injashkin", - "NooNoo1337", - "Roman-Halenko", - "sergeomak", - "Elena_Petrenko", - "uandrew", - "slychai85", - "superpuper32", - "GennadyGlushenkov" - ] - }, "Learn/JavaScript/Objects/Object_building_practice": { "modified": "2020-07-16T22:32:32.476Z", "contributors": [ @@ -24039,6 +24018,27 @@ "iegik" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-11-28T15:15:40.063Z", + "contributors": [ + "Tartalon", + "Viatcheslav-Malahov", + "wind-of", + "Detrimon", + "BadLame", + "ConstantineZz", + "ellegre", + "injashkin", + "NooNoo1337", + "Roman-Halenko", + "sergeomak", + "Elena_Petrenko", + "uandrew", + "slychai85", + "superpuper32", + "GennadyGlushenkov" + ] + }, "conflicting/MDN/Contribute": { "modified": "2020-10-30T09:21:05.942Z", "contributors": [ diff --git a/files/ru/learn/javascript/objects/object-oriented_js/index.html b/files/ru/conflicting/learn/javascript/objects/classes_in_javascript/index.html index 409aa367f2..3fad32994e 100644 --- a/files/ru/learn/javascript/objects/object-oriented_js/index.html +++ b/files/ru/conflicting/learn/javascript/objects/classes_in_javascript/index.html @@ -1,6 +1,6 @@ --- title: Объектно-ориентированный JavaScript для начинающих -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript tags: - Constructor - Create @@ -11,7 +11,7 @@ tags: - ООП - экземпляр translation_of: Learn/JavaScript/Objects/Object-oriented_JS -original_slug: Learn/JavaScript/Объекты/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/ru/learn/javascript/objects/inheritance/index.html b/files/ru/learn/javascript/objects/classes_in_javascript/index.html index f1514a92c6..ec27663266 100644 --- a/files/ru/learn/javascript/objects/inheritance/index.html +++ b/files/ru/learn/javascript/objects/classes_in_javascript/index.html @@ -1,12 +1,12 @@ --- title: Наследование в JavaScript -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript tags: - JavaScript - Наследование - ООП translation_of: Learn/JavaScript/Objects/Inheritance -original_slug: Learn/JavaScript/Объекты/Inheritance +original_slug: Learn/JavaScript/Objects/Inheritance --- <p> <audio class="audio-for-speech"></audio> diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt index 1a0110161e..46bba1f59e 100644 --- a/files/zh-cn/_redirects.txt +++ b/files/zh-cn/_redirects.txt @@ -1096,6 +1096,8 @@ /zh-CN/docs/Learn/HTML/Multimedia_and_embedding/在网页中添加矢量图形 /zh-CN/docs/Learn/HTML/Multimedia_and_embedding/Adding_vector_graphics_to_the_Web /zh-CN/docs/Learn/JavaScript/First_steps/变量 /zh-CN/docs/Learn/JavaScript/First_steps/Variables /zh-CN/docs/Learn/JavaScript/First_steps/第一点 /zh-CN/docs/Learn/JavaScript/First_steps/A_first_splash +/zh-CN/docs/Learn/JavaScript/Objects/Inheritance /zh-CN/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/zh-CN/docs/Learn/JavaScript/Objects/Object-oriented_JS /zh-CN/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /zh-CN/docs/Learn/JavaScript/Objects/向“弹跳球”演示程序添加新功能 /zh-CN/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features /zh-CN/docs/Learn/JavaScript/Objects/测试你的技能:面向对象的Javascript /zh-CN/docs/Learn/JavaScript/Objects/Test_your_skills:_Object-oriented_JavaScript /zh-CN/docs/Learn/Tools_and_testing/Client-side_JavaScript_frameworks/介绍 /zh-CN/docs/Learn/Tools_and_testing/Client-side_JavaScript_frameworks/Introduction diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json index 316c67967b..3b0798204d 100644 --- a/files/zh-cn/_wikihistory.json +++ b/files/zh-cn/_wikihistory.json @@ -4716,7 +4716,7 @@ "supermanbin" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-07-30T15:02:15.810Z", "contributors": [ "Damoness", @@ -4753,31 +4753,6 @@ "VtanSen" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-11-05T13:41:11.779Z", - "contributors": [ - "ceociocto", - "Jepson", - "ChongyouXu", - "九千鸦", - "Catherine-G", - "voidxiaobei", - "oceanMIH", - "WindLo", - "real-Row", - "GKilyar", - "Ray-Eldath", - "HYdragon", - "GloryChou", - "1013940326", - "Viki-Zhang", - "Leivy", - "breakair", - "zhangyangcisco", - "cylmemory", - "keyulin" - ] - }, "Learn/JavaScript/Objects/Object_building_practice": { "modified": "2020-07-16T22:32:33.084Z", "contributors": [ @@ -46762,6 +46737,31 @@ "xcffl" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-11-05T13:41:11.779Z", + "contributors": [ + "ceociocto", + "Jepson", + "ChongyouXu", + "九千鸦", + "Catherine-G", + "voidxiaobei", + "oceanMIH", + "WindLo", + "real-Row", + "GKilyar", + "Ray-Eldath", + "HYdragon", + "GloryChou", + "1013940326", + "Viki-Zhang", + "Leivy", + "breakair", + "zhangyangcisco", + "cylmemory", + "keyulin" + ] + }, "conflicting/Learn/Server-side/Django": { "modified": "2019-03-23T23:11:53.165Z", "contributors": [ diff --git a/files/zh-cn/learn/javascript/objects/object-oriented_js/index.html b/files/zh-cn/conflicting/learn/javascript/objects/classes_in_javascript/index.html index ddd1f3d2d5..5b6fa5b218 100644 --- a/files/zh-cn/learn/javascript/objects/object-oriented_js/index.html +++ b/files/zh-cn/conflicting/learn/javascript/objects/classes_in_javascript/index.html @@ -1,7 +1,8 @@ --- title: 适合初学者的JavaScript面向对象 -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript translation_of: Learn/JavaScript/Objects/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/zh-cn/learn/javascript/objects/inheritance/index.html b/files/zh-cn/learn/javascript/objects/classes_in_javascript/index.html index eca486d343..635b1a9574 100644 --- a/files/zh-cn/learn/javascript/objects/inheritance/index.html +++ b/files/zh-cn/learn/javascript/objects/classes_in_javascript/index.html @@ -1,6 +1,6 @@ --- title: JavaScript 中的继承 -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript tags: - JavaScript - OOJS @@ -9,6 +9,7 @@ tags: - 继承 - 面向对象JS translation_of: Learn/JavaScript/Objects/Inheritance +original_slug: Learn/JavaScript/Objects/Inheritance --- <div>{{LearnSidebar}}</div> diff --git a/files/zh-tw/_redirects.txt b/files/zh-tw/_redirects.txt index 69b77abb4b..d962490e46 100644 --- a/files/zh-tw/_redirects.txt +++ b/files/zh-tw/_redirects.txt @@ -440,6 +440,8 @@ /zh-TW/docs/Learn/JavaScript/First_steps/有用的字符串方法 /zh-TW/docs/Learn/JavaScript/First_steps/Useful_string_methods /zh-TW/docs/Learn/JavaScript/First_steps/變數 /zh-TW/docs/Learn/JavaScript/First_steps/Variables /zh-TW/docs/Learn/JavaScript/First_steps/陣列 /zh-TW/docs/Learn/JavaScript/First_steps/Arrays +/zh-TW/docs/Learn/JavaScript/Objects/Inheritance /zh-TW/docs/Learn/JavaScript/Objects/Classes_in_JavaScript +/zh-TW/docs/Learn/JavaScript/Objects/Object-oriented_JS /zh-TW/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript /zh-TW/docs/Learn/JavaScript/如何運用 /zh-TW/docs/Learn/JavaScript/Howto /zh-TW/docs/Learn/JavaScript/第一步 /zh-TW/docs/Learn/JavaScript/First_steps /zh-TW/docs/Learn/Performance/多媒體 /zh-TW/docs/Learn/Performance/Multimedia diff --git a/files/zh-tw/_wikihistory.json b/files/zh-tw/_wikihistory.json index 3b23303592..d0f838a37b 100644 --- a/files/zh-tw/_wikihistory.json +++ b/files/zh-tw/_wikihistory.json @@ -1668,7 +1668,7 @@ "MashKao" ] }, - "Learn/JavaScript/Objects/Inheritance": { + "Learn/JavaScript/Objects/Classes_in_JavaScript": { "modified": "2020-07-16T22:32:17.083Z", "contributors": [ "tangerine1202", @@ -1684,17 +1684,6 @@ "MashKao" ] }, - "Learn/JavaScript/Objects/Object-oriented_JS": { - "modified": "2020-07-16T22:32:09.821Z", - "contributors": [ - "DahisC", - "tangerine1202", - "iigmir", - "cjchng", - "roycrxtw", - "MashKao" - ] - }, "Learn/JavaScript/Objects/Object_building_practice": { "modified": "2020-07-16T22:32:33.523Z", "contributors": [ @@ -7979,6 +7968,17 @@ "sailplaneTW" ] }, + "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": { + "modified": "2020-07-16T22:32:09.821Z", + "contributors": [ + "DahisC", + "tangerine1202", + "iigmir", + "cjchng", + "roycrxtw", + "MashKao" + ] + }, "conflicting/Learn/Server-side/Django": { "modified": "2019-03-23T23:33:19.493Z", "contributors": [ diff --git a/files/zh-tw/learn/javascript/objects/object-oriented_js/index.html b/files/zh-tw/conflicting/learn/javascript/objects/classes_in_javascript/index.html index 1504f5fc49..3b5bb0b688 100644 --- a/files/zh-tw/learn/javascript/objects/object-oriented_js/index.html +++ b/files/zh-tw/conflicting/learn/javascript/objects/classes_in_javascript/index.html @@ -1,7 +1,8 @@ --- title: 初學者應知道的物件導向 JavaScript -slug: Learn/JavaScript/Objects/Object-oriented_JS +slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript translation_of: Learn/JavaScript/Objects/Object-oriented_JS +original_slug: Learn/JavaScript/Objects/Object-oriented_JS --- <div>{{LearnSidebar}}</div> diff --git a/files/zh-tw/learn/javascript/objects/inheritance/index.html b/files/zh-tw/learn/javascript/objects/classes_in_javascript/index.html index f9db84dae8..fdbd246ba2 100644 --- a/files/zh-tw/learn/javascript/objects/inheritance/index.html +++ b/files/zh-tw/learn/javascript/objects/classes_in_javascript/index.html @@ -1,7 +1,8 @@ --- title: JavaScript 中的「繼承」 -slug: Learn/JavaScript/Objects/Inheritance +slug: Learn/JavaScript/Objects/Classes_in_JavaScript translation_of: Learn/JavaScript/Objects/Inheritance +original_slug: Learn/JavaScript/Objects/Inheritance --- <div>{{LearnSidebar}}</div> |