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 +19 -6
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58c01c4108 - Show all commits

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

@ -174,9 +174,25 @@ var setState = function (res) {
if (res.sequence == true) { if (res.sequence == true) {
STATE.sequence = true; STATE.sequence = true;
mobile.ble.active = true; mobile.ble.active = true;
document.getElementById('seq').classList.add('focus'); seqState(true);
} }
}; };
var seqState = function (state) {
const elem = document.getElementById('seq')
if (state) {
if (!elem.classList.contains('focus')) {
elem.classList.add('focus');
elem.innerText = 'STOP SEQUENCE';
}
} else {
if (elem.classList.contains('focus')) {
elem.classList.remove('focus');
elem.innerText = 'START SEQUENCE';
}
}
};
var appPage = function () { var appPage = function () {
unsetPages(); unsetPages();
document.getElementById('app').classList.add('selected'); document.getElementById('app').classList.add('selected');

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

@ -152,14 +152,11 @@ web.sequenceSuccess = function (res) {
if (res.started && res.started != false) { if (res.started && res.started != false) {
STATE.sequence = true; STATE.sequence = true;
document.getElementById('seq').focus(); document.getElementById('seq').focus();
if (!document.getElementById('seq').classList.contains('focus')) { seqState(true);
document.getElementById('seq').classList.add('focus');
}
} else if (res.stopped) { } else if (res.stopped) {
STATE.sequence = false; STATE.sequence = false;
document.getElementById('seq').blur(); document.getElementById('seq').blur();
document.getElementById('seq').classList.remove('focus'); seqState(false);
//update frontend at end of sequence
mobile.getState(); mobile.getState();
} }
} }