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 1 additions and 2 deletions
Showing only changes of commit 29800a7b45 - Show all commits

View File

@ -509,11 +509,10 @@ null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"
web.setExposureSuccess = function (res) { web.setExposureSuccess = function (res) {
'use strict'; 'use strict';
var exposure; var exposure;
if (res.exposure) { if (res.exposure < BOLEX.expected) {
res.exposure = BOLEX.expected; res.exposure = BOLEX.expected;
} }
STATE.exposure = res.exposure; STATE.exposure = res.exposure;
console.log(STATE.exposure);
exposure = shutter(STATE.exposure); exposure = shutter(STATE.exposure);
$('#str').text(exposure.str); $('#str').text(exposure.str);
console.log('setExposure to ' + res.exposure); console.log('setExposure to ' + res.exposure);