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 53 additions and 35 deletions
Showing only changes of commit 96bd6050d3 - Show all commits

View File

@ -2,10 +2,17 @@
<html> <html>
<head> <head>
<title>intval 3</title> <title>intval 3</title>
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="format-detection" content="telephone=no">
<meta name = "viewport" content = "width = 320, initial-scale = 2.3, user-scalable = no">
<style> <style>
html,body{ html,body{
background: #212121; background: #212121;
} }
*{
color: #fff;
font-family: 'Arial Neue', Helvetical, Arial, sans-serif;
}
/* The switch - the box around the slider */ /* The switch - the box around the slider */
.switch { .switch {
position: relative; position: relative;
@ -72,6 +79,7 @@
-webkit-appearance: none; -webkit-appearance: none;
background: transparent; background: transparent;
box-shadow: none; box-shadow: none;
margin: 5px 0;
} }
button{ button{
border: 1px solid #fff; border: 1px solid #fff;
@ -81,23 +89,32 @@
background: transparent; background: transparent;
-webkit-appearance: none; -webkit-appearance: none;
box-shadow: none; box-shadow: none;
outline: none;
margin: 5px 0;
} }
button:focus{ button:focus{
background-color: #20ce45; background-color: #20ce45;
border-color: #20ce45; border-color: #20ce45;
color: #212121;
} }
</style> </style>
</head> </head>
<body> <body>
<div> <div>
<div>Direction</div>
<label class="switch" onclick="setDir();"> <label class="switch" onclick="setDir();">
<input type="checkbox" id="dir"> <input type="checkbox" id="dir">
<span class="slider round"></span> <span class="slider round"></span>
</label> </label>
</div> </div>
<div> <div>
<div>Exposure (ms)</div>
<input type="number" id="exposure" value="630" min="630" step="1" /> <input type="number" id="exposure" value="630" min="630" step="1" />
</div> </div>
<div>
<div>Delay (ms)</div>
<input type="number" id="delay" value="0" min="0" step="1" />
</div>
<div> <div>
<button id="seq">Sequence</button> <button id="seq">Sequence</button>
</div> </div>
@ -128,6 +145,7 @@ web.frame = function () {
} }
web.frameSuccess = function (res) { web.frameSuccess = function (res) {
'use strict'; 'use strict';
$('#frame').blur();
console.dir(res); console.dir(res);
}; };
web.setDir = function () { web.setDir = function () {
@ -135,13 +153,13 @@ web.setDir = function () {
}; };
web.setDirSuccess = function (res) { web.setDirSuccess = function (res) {
'use strict'; 'use strict';
console.dir(res) console.dir(res);
}; };
web.init = function () { web.init = function () {
'use strict'; 'use strict';
frame = web.frame frame = web.frame;
setDir = web.setDir setDir = web.setDir;
setExposure = web.setExposure setExposure = web.setExposure;
}; };
web.init(); web.init();
</script> </script>