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 6 deletions
Showing only changes of commit 2543a24b32 - Show all commits

View File

@ -268,7 +268,6 @@
var setCounter; var setCounter;
//ms //ms
var shutter = function (exposure) { var shutter = function (exposure) {
'use strict';
var fraction = BOLEX.expected / 1000; var fraction = BOLEX.expected / 1000;
var speed; var speed;
var corrected; var corrected;
@ -301,7 +300,6 @@
}; };
var scaleAuto = function (ms) { var scaleAuto = function (ms) {
'use strict';
if (ms < 1000) { if (ms < 1000) {
return 'ms' return 'ms'
} else if (ms >= 1000 && ms < 1000 * 60) { } else if (ms >= 1000 && ms < 1000 * 60) {
@ -314,7 +312,6 @@
}; };
var scaleTime = function (raw, scale) { var scaleTime = function (raw, scale) {
'use strict';
if (scale === 'ms') { if (scale === 'ms') {
return raw return raw
} else if (scale === 'sec') { } else if (scale === 'sec') {
@ -327,7 +324,6 @@
}; };
var setExposureScale = function () { var setExposureScale = function () {
'use strict';
const scale = document.getElementById('scale').value; const scale = document.getElementById('scale').value;
const elem = document.getElementById('exposure'); const elem = document.getElementById('exposure');
if (scale === 'ms') { if (scale === 'ms') {
@ -343,7 +339,6 @@
}; };
var setDelayScale = function () { var setDelayScale = function () {
'use strict';
const scale = document.getElementById('scale').value; const scale = document.getElementById('scale').value;
const elem = document.getElementsById('delay'); const elem = document.getElementsById('delay');
if (scale === 'ms') { if (scale === 'ms') {
@ -490,7 +485,7 @@
opts = { opts = {
method : 'POST', method : 'POST',
headers : web._header, headers : web._header,
body : JSON.stringify({ eposure : scaledExposure }) body : JSON.stringify({ exposure : scaledExposure })
} }
fetch('/exposure', opts) fetch('/exposure', opts)
.then(web.useJson) .then(web.useJson)