Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 3 additions and 2 deletions
Showing only changes of commit 6801f30881 - Show all commits

View File

@ -488,10 +488,11 @@ null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"
} }
STATE.exposure = res.frame.exposure; STATE.exposure = res.frame.exposure;
exposure = shutter(STATE.exposure); exposure = shutter(STATE.exposure);
$('#str').text(exposure.str);
scale = scaleAuto(STATE.exposure); scale = scaleAuto(STATE.exposure);
STATE.scale = scale; STATE.scale = scale;
$('#exposure').val(STATE.exposure); scaledExposure = scaleTime(STATE.exposure, STATE.scale);
$('#str').text(exposure.str);
$('#exposure').val(scaledExposure);
$('#scale').val(scale); $('#scale').val(scale);
$('#delay').val(res.frame.delay); $('#delay').val(res.frame.delay);