Skip to content

Commit

Permalink
Merge pull request #2270 from ioBroker/axiosTest
Browse files Browse the repository at this point in the history
chore: release v1.10.11
  • Loading branch information
arteck authored Nov 2, 2024
2 parents 3398f62 + 2ed4a12 commit bfd5646
Show file tree
Hide file tree
Showing 14 changed files with 96 additions and 126 deletions.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,20 @@ You can thank the authors by these links:

-----------------------------------------------------------------------------------------------------
## Changelog

### ### 1.10.10 (2024-09-27)
### 1.10.11 (2024-11-02)
* BREAKING CHANGE
*
* bugs : ChannelScan is currently not available
*
*
* (lebrinkma) fix linter errors
* (asgothian) disable map display for deactivated devices
* (asgothian) new option on map: disable physics interaction
* (asgothian) new zigbee-herdsman-converters 20.28.0
* (asgothian) new zigbee-herdsman 2.1.1
* (asgothian) Allow use of keyless converters (used for TuYa and compatible devices in zigbee-herdsman-converters
* (arteck) swap from request to axios
* (arteck) delete groups works again

### 1.10.9 (2024-09-05)
* (arteck) typo admin settings
Expand All @@ -170,7 +175,6 @@ You can thank the authors by these links:
### 1.10.3 (2024-04-06)
* (arteck) dependency update

## Changelog
### 1.10.2 (2024-01-25)
* (arteck) dependency update

Expand Down Expand Up @@ -592,7 +596,6 @@ new Zigbee-herdsman features:
* Some design update
* Binding


## License
The MIT License (MIT)

Expand Down
20 changes: 10 additions & 10 deletions admin/adapter-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $(document).ready(function () {
function loadSystemConfig(callback) {
socket.emit('getObject', 'system.config', function (err, res) {
if (!err && res && res.common) {
systemLang = res.common.language || systemLang;
// systemLang = res.common.language || systemLang;
systemConfig = res;
}
socket.emit('getObject', 'system.certificates', function (err, res) {
Expand Down Expand Up @@ -96,12 +96,12 @@ function loadSettings(callback) {
if (typeof load === 'undefined') {
alert('Please implement save function in your admin/index.html');
} else {
const _query = query.split('&');
const _query = query.split('&');
for (let 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);
}
if (_query[q].indexOf('react=') !== -1) {
$('.adapter-container').addClass('react-' + _query[q].substring(6));
theme = 'react-' + _query[q].substring(6);
}
}
load(res.native, onChange);
}
Expand All @@ -122,19 +122,19 @@ function loadSettings(callback) {
window.addEventListener('resize', checkMediaQuery);

function checkMediaQuery() {
const mediaQuery = window.matchMedia("(max-width: 600px)");
const mediaQuery = window.matchMedia('(max-width: 600px)');

if (mediaQuery.matches) {
designFix();
console.log("Screen < 600px.");
console.log('Screen < 600px.');
} else {
console.log("Screen > 600px.");
console.log('Screen > 600px.');
}
}

// Design Fix simatec
function designFix() {
var dropdownToggle = document.querySelector('.dropdown-toggle');
const dropdownToggle = document.querySelector('.dropdown-toggle');

if (!dropdownToggle) {
const cols = document.querySelectorAll('.col:not(.tab)');
Expand Down
10 changes: 5 additions & 5 deletions admin/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function getDevice(ieeeAddr) {
});
}

// eslint-disable-next-line no-unused-vars

function getDeviceByNetwork(nwk) {
return devices.find((devInfo) => {
try {
Expand Down Expand Up @@ -795,7 +795,7 @@ function getMap() {
}

// the function loadSettings has to exist ...
// eslint-disable-next-line no-unused-vars

function load(settings, onChange) {
if (settings.panID === undefined) {
settings.panID = 6754;
Expand Down Expand Up @@ -984,7 +984,7 @@ function showPairingProcess() {

// ... and the function save has to exist.
// 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) {
const obj = {};
$('.value').each(function () {
Expand Down Expand Up @@ -1312,7 +1312,7 @@ function showNetworkMap(devices, map) {
nodes: nodesArray,
edges: mapEdges
};

network = new vis.Network(container, data, networkOptions);

const onMapSelect = function (event) {
Expand Down Expand Up @@ -2552,7 +2552,7 @@ function showChannels() {
}
}
});
showWaitingDialog('Scanning channels', 10);
showWaitingDialog('Scanning channels - not working yet', 10);
}

function onlyOne(devs) {
Expand Down
2 changes: 1 addition & 1 deletion admin/words.js

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

Loading

0 comments on commit bfd5646

Please sign in to comment.