diff --git a/app.js b/app.js index b7f040c..31ce269 100755 --- a/app.js +++ b/app.js @@ -189,7 +189,8 @@ const cameraStream = document.querySelector("#camera-stream"), uiMain = document.querySelector("#ui-main"), uiCapture = document.querySelector("#ui-capture"), uiSettings = document.querySelector("#ui-settings"), - uiHidden = document.querySelector("#ui-hidden"); + uiHidden = document.querySelector("#ui-hidden"), + uiTimer = document.querySelector("#ui-timer"); var amountOfCameras = 0; var currentFacingMode = 'user'; var appScale; @@ -380,6 +381,12 @@ var buttons = { y:0, width:15, height:15 + }, + timer: { + x:33, + y:131, + width:13, + height:13 } }; @@ -543,6 +550,11 @@ function restartCamera() { window.onorientationchange = restartCamera; window.onresize = restartCamera; +function captureImage() { + cameraStream.pause(); + currentUI = uiCapture; +} + function initCameraUI() { initAppScaling(); @@ -554,8 +566,7 @@ function initCameraUI() { if(currentUI === uiMain) { if(isInside(mousePos, buttons.bottomLeft) || isInside(mousePos, buttons.screenHotspot)) { // shutter - cameraStream.pause(); - currentUI = uiCapture; + captureImage(); } else if(isInside(mousePos, buttons.bottomRight)) { // switch camera switchCameras(); @@ -565,6 +576,10 @@ function initCameraUI() { } else if(isInside(mousePos, buttons.hideUI)) { // hide UI buttons currentUI = uiHidden; + } else if(isInside(mousePos, buttons.timer)) { + // change UI to timer and trigger 3s delay to capture + currentUI = uiTimer; + setTimeout(captureImage, 3000); } } else if(currentUI === uiCapture) { if(isInside(mousePos, buttons.bottomLeft)) { diff --git a/index.html b/index.html index 8a9b194..7ee0d34 100755 --- a/index.html +++ b/index.html @@ -42,6 +42,7 @@ + diff --git a/sw.js b/sw.js index 1988183..7712106 100755 --- a/sw.js +++ b/sw.js @@ -1,4 +1,4 @@ -const cacheName = 'webgbcam-v1' +const cacheName = 'webgbcam-v2' self.addEventListener('install', function(e) { e.waitUntil( @@ -13,7 +13,8 @@ self.addEventListener('install', function(e) { 'ui-capture.png', 'ui-settings.png', 'ui-main.png', - 'ui-hidden.png' + 'ui-hidden.png', + 'ui-timer.png' ]); }) ); diff --git a/ui-main.png b/ui-main.png index 02d3568..56c2d1a 100755 Binary files a/ui-main.png and b/ui-main.png differ diff --git a/ui-timer.png b/ui-timer.png new file mode 100755 index 0000000..a964b90 Binary files /dev/null and b/ui-timer.png differ