Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pre release fix #154

Merged
merged 3 commits into from
Jan 17, 2019
Merged

Pre release fix #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66c6fa7
Merge pull request #4 from ioBroker/dev
allofmex Jan 17, 2019
c9f6756
zigbee publish result fix
allofmex Jan 17, 2019
98d3e16
Fix: checkbox and label in select not clickable
allofmex Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions admin/index_m.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
<style>
.m .col .select-wrapper+label, .m .col input+label:not(.active) {
top: -26px;
}
}
.select-wrapper li span {
pointer-events: none; // workarround for checkbox in select, else checkbox and label not clickable
}
.m .col input+label {
font-size: 0.8rem;
}
Expand Down Expand Up @@ -86,10 +89,10 @@ <h5 class="translate center-align">Zigbee adapter</h5>
<div class="nav-content">
<ul class="tabs tabs-transparent">
<li class="tab col s2"><a id="devs" href="#tab-main" class="translate">Devices</a></li>
<li class="tab col s2"><a href="#tab-groups" class="translate">Groups</a></li>
<li class="tab col s2"><a id="tabmap" href="#tab-map" class="translate">Network map</a></li>
<li class="tab col s2"><a id="settings" href="#tab-sett" class="translate">Settings</a></li>
<li class="tab col s2"><a id="develop" href="#tab-dev" class="translate">Developer</a></li>
<li class="tab col s2"><a href="#tab-groups" class="translate">Groups</a></li>
</ul>
</div>
</nav>
Expand Down
3 changes: 1 addition & 2 deletions lib/zigbeecontroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ class ZigbeeController extends EventEmitter {
`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep} ` +
`failed with error ${error}`);
}
//if (callback) callback(error, resp);
if (callback) callback(error, resp);
};
if (type === 'functional') {
device.functional(cid, cmd, zclData, cfg, callback_);
Expand All @@ -379,7 +379,6 @@ class ZigbeeController extends EventEmitter {
} else {
this.error(`Unknown zigbee publish type ${type}`);
}
if (callback) callback();
queueCallback();
});
}
Expand Down