16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fdc43fdc37 - Show all commits

1
app/www/static/js/intval.core.js
View File

@ -172,7 +172,6 @@ var setState = function (res) {
setDelayScale(); setDelayScale();
if (res.sequence == true) { if (res.sequence == true) {
console.log(res.sequence);
STATE.sequence = true; STATE.sequence = true;
mobile.ble.active = true; mobile.ble.active = true;
document.getElementById('seq').classList.add('focus'); document.getElementById('seq').classList.add('focus');

2
app/www/static/js/intval.web.js
View File

@ -159,6 +159,8 @@ web.sequenceSuccess = function (res) {
STATE.sequence = false; STATE.sequence = false;
document.getElementById('seq').blur(); document.getElementById('seq').blur();
document.getElementById('seq').classList.remove('focus'); document.getElementById('seq').classList.remove('focus');
//update frontend at end of sequence
mobile.getState();
} }
} }
web.useJson = function (res) { web.useJson = function (res) {