From c1366ef5eb271a70fb3233bb92c1783608713bc8 Mon Sep 17 00:00:00 2001 From: MaxOvs Date: Fri, 18 Nov 2022 19:21:45 +0300 Subject: [PATCH] Fixed language --- src/cg-dropdown.js | 30 +++++++++++++++++++----------- src/index.js | 3 +-- src/language/language.js | 2 ++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/cg-dropdown.js b/src/cg-dropdown.js index 9bab76a..5a7c017 100644 --- a/src/cg-dropdown.js +++ b/src/cg-dropdown.js @@ -95,7 +95,7 @@ export class DropDown { darkTheme: true/false, searchMode: true/false, closeOnSelect: true/false, - lenguage: 'ru/en', + language: 'ru/en', styles: { head: { background: '...', @@ -251,14 +251,18 @@ export class DropDown { /** * Метод экземпляра класса DropDown - * @param {object} lenguage объект в котором находятся поля для подключения языка имеет два обязательных поля placeholder, textInListSearch + * @param {object} language объект в котором находятся поля для подключения языка имеет два обязательных поля placeholder, textInListSearch * @description метод позволяющий заменить плейсхолдер в поиске и текст который выводится если нет результата - * @method addLenguage + * @method addLanguage */ - addLenguage(lenguage) { - const { placeholder, textInListSearch } = lenguage; + addLanguage(language) { + const { placeholder, textInListSearch, selectPlaceholder } = language; const { searchMode } = this.#options; + const select = this.#element.querySelector('.selected'); + const textNodeSelect = document.createTextNode(selectPlaceholder); + select.appendChild(textNodeSelect); + if (searchMode && searchMode == true) { const search = this.#element.querySelector('.inputSearch'); const textNoRezult = this.#element.querySelector('.noRezult'); @@ -350,14 +354,18 @@ export class DropDown { * @protected */ #initSelected(select) { - const { styles, selected, placeholder, lable } = this.#options; + const { styles, selected, placeholder, lable, language } = this.#options; if (selected) { createSelected(this.#element, selected); } else if (placeholder) { createSelected(this.#element, placeholder); } else { - createSelected(this.#element, 'Select...'); + if (language && language === 'ru') { + createSelected(this.#element, ru.selectPlaceholder); + } else { + createSelected(this.#element, en.selectPlaceholder); + } } if (select) { @@ -387,7 +395,7 @@ export class DropDown { * @description Рендер елементов в селекте. */ #render(select) { - const { styles, multiselect, searchMode, multiselectTag, darkTheme, lenguage } = this.#options; + const { styles, multiselect, searchMode, multiselectTag, darkTheme, language } = this.#options; const { list, search } = styles; const random = Math.random().toString(36).substring(2, 10); @@ -406,7 +414,7 @@ export class DropDown { this.random = random; if (searchMode) { - if (lenguage === 'ru') { + if (language === 'ru') { intputSearch = createInputSearch(random, ru.placeholder); } else { intputSearch = createInputSearch(random, en.placeholder); @@ -734,14 +742,14 @@ export class DropDown { * @method #searchMode */ #searchMode(random) { - const { lenguage } = this.#options; + const { language } = this.#options; const input = this.#element.querySelector(`#searchSelect-${random}`); const searchSelect = this.#element.querySelectorAll('.list__item'); const result = document.createElement('p'); let textNode = ''; - if (lenguage === 'ru') { + if (language && language === 'ru') { textNode = document.createTextNode(`${ru.textInListSearch}`); } else { textNode = document.createTextNode(`${en.textInListSearch}`); diff --git a/src/index.js b/src/index.js index b57cbb2..d6e950b 100644 --- a/src/index.js +++ b/src/index.js @@ -5,7 +5,6 @@ const dropdown = new DropDown({ selector: '.cg-dropdown_one', placeholder: 'Выберите авто', lable: 'EXAMPLE', - items: [ 'BMW', { @@ -41,7 +40,7 @@ const dropdown3 = new DropDown({ url: 'https://jsonplaceholder.typicode.com/users', searchMode: true, darkTheme: false, - lenguage: 'ru', + language: 'ru', styles: { head: { width: '830px', diff --git a/src/language/language.js b/src/language/language.js index 99d2ad5..2095dcb 100644 --- a/src/language/language.js +++ b/src/language/language.js @@ -1,9 +1,11 @@ export const ru = { + selectPlaceholder: 'Выберите элемент...', placeholder: 'Поиск...', textInListSearch: 'Совпадений нет...', }; export const en = { + selectPlaceholder: 'Select...', placeholder: 'Search...', textInListSearch: 'No matches...', };