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 +14 -13
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c267fa9fb - Show all commits

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

@ -11,14 +11,15 @@ const STATE = {
scale : 'ms', scale : 'ms',
delayScale : 'ms', delayScale : 'ms',
counter : 0 counter : 0
} };
//functions //functions
let frame; window.frame = null;
let getState; window.getState = null;
let setDir; window.setDir = null;
let setExposure; window.setExposure = null;
let setDelay; window.setDelay = null;
let setCounter; window.setCounter = null;
//ms //ms
var shutter = function (exposure) { var shutter = function (exposure) {
let fraction = BOLEX.expected / 1000; let fraction = BOLEX.expected / 1000;

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

@ -162,11 +162,11 @@ web.useJson = function (res) {
return res.json(); return res.json();
} }
web.init = function () { web.init = function () {
frame = web.frame; window.frame = web.frame;
getState = web.getState; window.getState = web.getState;
setDir = web.setDir; window.setDir = web.setDir;
setExposure = web.setExposure; window.setExposure = web.setExposure;
setCounter = web.setCounter; window.setCounter = web.setCounter;
web.getState(); getState();
}; };