Skip to content

Commit

Permalink
chore: release v1.10.9
Browse files Browse the repository at this point in the history
* (arteck) typo admin settings
* (arteck) eslint config
  • Loading branch information
arteck committed Sep 5, 2024
1 parent 3836019 commit 4dd48ca
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 41 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 11 additions & 15 deletions admin/adapter-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('&');

Check failure on line 99 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14

Check failure on line 99 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14
for (var q = 0; q < _query.length; q++) {

Check failure on line 100 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14

Check warning on line 100 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Unexpected var, use let or const instead

Check failure on line 100 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14

Check warning on line 100 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Unexpected var, use let or const instead
if (_query[q].indexOf('react=') !== -1) {

Check failure on line 101 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 20 spaces but found 16

Check failure on line 101 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 20 spaces but found 16
$('.adapter-container').addClass('react-' + _query[q].substring(6));

Check failure on line 102 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 24 spaces but found 18

Check failure on line 102 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 24 spaces but found 18
theme = 'react-' + _query[q].substring(6);

Check failure on line 103 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 24 spaces but found 18

Check failure on line 103 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 24 spaces but found 18
}

Check failure on line 104 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 20 spaces but found 16

Check failure on line 104 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 20 spaces but found 16

load(res.native, onChange);
}

Check failure on line 105 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14

Check failure on line 105 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14
load(res.native, onChange);

Check failure on line 106 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14

Check failure on line 106 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14
}
if (typeof callback === 'function') {
callback();
}
} else {
if (typeof callback === 'function') {
callback();
}
alert('error loading settings for ' + _adapterInstance + '\n\n' + err);
if (typeof callback === 'function') {

Check failure on line 112 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 12 spaces but found 10

Check failure on line 112 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 12 spaces but found 10
callback();

Check failure on line 113 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14

Check failure on line 113 in admin/adapter-settings.js

View workflow job for this annotation

GitHub Actions / check-and-lint

Expected indentation of 16 spaces but found 14
}
alert('error loading settings for ' + _adapterInstance + '\n\n' + err);
}
});
}
Expand Down
9 changes: 1 addition & 8 deletions admin/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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');
Expand Down Expand Up @@ -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();
Expand All @@ -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));
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions eslint.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
28 changes: 14 additions & 14 deletions io-package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.zigbee",
"version": "1.10.8",
"version": "1.10.9",
"author": {
"name": "Kirov Ilya",
"email": "kirovilya@gmail.com"
Expand Down

0 comments on commit 4dd48ca

Please sign in to comment.