From 4dd48ca8276335bbbea21b5a4be86a1bcbca83aa Mon Sep 17 00:00:00 2001 From: arteck <6681528+arteck@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:22:26 +0200 Subject: [PATCH] chore: release v1.10.9 * (arteck) typo admin settings * (arteck) eslint config --- README.md | 5 ++++- admin/adapter-settings.js | 26 +++++++++++--------------- admin/admin.js | 9 +-------- eslint.config.cjs | 2 ++ io-package.json | 28 ++++++++++++++-------------- package-lock.json | 4 ++-- package.json | 2 +- 7 files changed, 35 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index ead4484e..31ef0c37 100644 --- a/README.md +++ b/README.md @@ -131,10 +131,13 @@ You can thank the authors by these links: * to Arthur Rupp https://paypal.me/ArthurRupp ----------------------------------------------------------------------------------------------------- +### 1.10.9 (2024-09-05) +* (arteck) typo admin settings +* (arteck) eslint config + ### 1.10.8 (2024-09-05) * (arteck) corr admin settings * (arteck) add new eslint version -* ### 1.10.7 (2024-09-05) * (arteck) add flow control option diff --git a/admin/adapter-settings.js b/admin/adapter-settings.js index 5fcf8e1b..e8beaf3b 100644 --- a/admin/adapter-settings.js +++ b/admin/adapter-settings.js @@ -96,27 +96,23 @@ function loadSettings(callback) { if (typeof load === 'undefined') { alert('Please implement save function in your admin/index.html'); } else { - // detect, that we are now in react container (themeNames = ['dark', 'blue', 'colored', 'light']) - - const _query = query.split('&'); - - for (var q = 0; q < _query.length; q++) { - if (_query[q].indexOf('react=') !== -1) { - $('.adapter-container').addClass('react-' + _query[q].substring(6)); - theme = 'react-' + _query[q].substring(6); - } + const _query = query.split('&'); + for (var q = 0; q < _query.length; q++) { + if (_query[q].indexOf('react=') !== -1) { + $('.adapter-container').addClass('react-' + _query[q].substring(6)); + theme = 'react-' + _query[q].substring(6); } - - load(res.native, onChange); + } + load(res.native, onChange); } if (typeof callback === 'function') { callback(); } } else { - if (typeof callback === 'function') { - callback(); - } - alert('error loading settings for ' + _adapterInstance + '\n\n' + err); + if (typeof callback === 'function') { + callback(); + } + alert('error loading settings for ' + _adapterInstance + '\n\n' + err); } }); } diff --git a/admin/admin.js b/admin/admin.js index 4b905557..eb4286ba 100644 --- a/admin/admin.js +++ b/admin/admin.js @@ -368,7 +368,6 @@ function editName(id, name) { console.log('editName called with ' + name); const dev = devices.find((d) => d._id == id); $('#modaledit').find('input[id=\'d_name\']').val(name); -// if (dev.info && dev.info.device._type == 'Router') { const groupables = []; if (dev && dev.info && dev.info.endpoints) { for (const ep of dev.info.endpoints) { @@ -378,7 +377,6 @@ function editName(id, name) { } } const numEP = groupables.length; -// console.log('groupables: '+JSON.stringify(groupables)); $('#modaledit').find('.row.epid0').addClass('hide'); $('#modaledit').find('.row.epid1').addClass('hide'); $('#modaledit').find('.row.epid2').addClass('hide'); @@ -416,10 +414,6 @@ function editName(id, name) { list2select('#d_groups_ep' + i, groups, groupables[i].memberOf || []); } } -// } else { -// $('#modaledit').find('.input-field.endpoints').addClass('hide'); -// $('#modaledit').find('.input-field.groups').addClass('hide'); -// } $('#modaledit a.btn[name=\'save\']').unbind('click'); $('#modaledit a.btn[name=\'save\']').click(() => { const newName = $('#modaledit').find('input[id=\'d_name\']').val(); @@ -428,7 +422,7 @@ function editName(id, name) { for (var i = 0; i < groupables.length; i++) { const ng = $('#d_groups_ep' + i).val(); if (ng.toString() != groupables[i].memberOf.toString()) - groupsbyid[groupables[i].ep.ID] = GenerateGroupChange(groupables[i].memberOf, ng); + groupsbyid[groupables[i].ep.ID] = GenerateGroupChange(groupables[i].memberOf, ng); } } console.log('grpid ' + JSON.stringify(groupsbyid)); @@ -976,7 +970,6 @@ function showPairingProcess() { // you have to make sure the callback is called with the settings object as first param! // eslint-disable-next-line no-unused-vars function save(callback) { - // example: select elements with class=value and build settings object const obj = {}; $('.value').each(function () { const $this = $(this); diff --git a/eslint.config.cjs b/eslint.config.cjs index c5583314..2c911fa6 100644 --- a/eslint.config.cjs +++ b/eslint.config.cjs @@ -46,6 +46,8 @@ module.exports = [ 'no-unsafe-finally': 'warn', 'no-cond-assign': 'warn', 'no-func-assign': 'warn', + 'no-global-assign': 'warn', + 'no-self-assign': 'warn', 'no-trailing-spaces': 'error', quotes: ['warn', 'single', diff --git a/io-package.json b/io-package.json index dd49b88e..0bf8e1bd 100644 --- a/io-package.json +++ b/io-package.json @@ -1,8 +1,21 @@ { "common": { "name": "zigbee", - "version": "1.10.8", + "version": "1.10.9", "news": { + "1.10.9": { + "en": "typo admin settings\neslint config", + "de": "typo admin einstellungen\neslint config", + "ru": "настройки admin\neslint config", + "pt": "configurações de administração do tipo\neslint config", + "nl": "typo admin instellingen\neslint config", + "fr": "paramètres d'administration typo\nconfig eslint", + "it": "impostazioni dell'amministratore\neslint config", + "es": "configuración de administración de tipo\neslint config", + "pl": "ustawienia admin typo\neslint config", + "uk": "параметри адміністратора\neslint config", + "zh-cn": "类型管理员设置\n埃斯林特配置" + }, "1.10.8": { "en": "corr admin settings\nadd new eslint version\n", "de": "korr admin einstellungen\nneue eslint-version hinzufügen\n", @@ -80,19 +93,6 @@ "pl": "aktualizacja zależności\n", "uk": "оновлення залежності\n", "zh-cn": "依赖性更新\n" - }, - "1.10.2": { - "en": "dependency update", - "de": "aktualisierung der abhängigkeit", - "ru": "обновление", - "pt": "atualização de dependência", - "nl": "afhankelijkheidsupdate", - "fr": "mise à jour de la dépendance", - "it": "aggiornamento della dipendenza", - "es": "actualización de la dependencia", - "pl": "aktualizacja zależności", - "uk": "оновлення залежності", - "zh-cn": "依赖性更新" } }, "titleLang": { diff --git a/package-lock.json b/package-lock.json index 430f8ba8..059386ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "iobroker.zigbee", - "version": "1.10.8", + "version": "1.10.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "iobroker.zigbee", - "version": "1.10.8", + "version": "1.10.9", "license": "MIT", "dependencies": { "@iobroker/adapter-core": "^3.1.3", diff --git a/package.json b/package.json index ac31bc25..7bad874a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iobroker.zigbee", - "version": "1.10.8", + "version": "1.10.9", "author": { "name": "Kirov Ilya", "email": "kirovilya@gmail.com"