From f7eba2aacd4e9efcbde255262a7b84df4509ecb8 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Sat, 11 Jul 2020 12:39:08 +0000 Subject: [PATCH] Bug 6815: Simplify code, add msGetUserMedia case --- .../intranet-tmpl/prog/js/pages/patron-webcam.js | 31 +++++++--------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/patron-webcam.js b/koha-tmpl/intranet-tmpl/prog/js/pages/patron-webcam.js index ff406b14cc..bead6bb0da 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/patron-webcam.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/patron-webcam.js @@ -11,6 +11,10 @@ function initializeCamera( camera_form ){ alert("Cannot load camera interface"); } }; + navigator.getMedia = ( navigator.getUserMedia || // use the proper vendor prefix + navigator.webkitGetUserMedia || + navigator.mozGetUserMedia || + navigator.msGetUserMedia ); // Put video listeners into place if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) { @@ -23,30 +27,15 @@ function initializeCamera( camera_form ){ ); } /* Legacy code below! */ - else if (navigator.getUserMedia) { // Standard - navigator.getUserMedia(mediaConfig, + else { + navigator.getMedia( + mediaConfig, function(stream) { video.src = stream; video.play(); }, errBack ); - } else if (navigator.webkitGetUserMedia) { // WebKit-prefixed - navigator.webkitGetUserMedia(mediaConfig, - function(stream) { - video.src = window.webkitURL.createObjectURL(stream); - video.play(); - }, - errBack - ); - } else if (navigator.mozGetUserMedia) { // Mozilla-prefixed - navigator.mozGetUserMedia(mediaConfig, - function(stream) { - video.src = window.URL.createObjectURL(stream); - video.play(); - }, - errBack - ); } camera_form.find("#snap").on("click", function(){ @@ -84,9 +73,9 @@ function initializeCamera( camera_form ){ } navigator.getMedia = ( navigator.getUserMedia || // use the proper vendor prefix - navigator.webkitGetUserMedia || - navigator.mozGetUserMedia || - navigator.msGetUserMedia); + navigator.webkitGetUserMedia || + navigator.mozGetUserMedia || + navigator.msGetUserMedia ); var div_take_image = document.getElementById('take_patron_image'); navigator.getMedia({video: true}, function(stream) { -- 2.11.0