Fix Mobile Safari issues

Grifo89 · Nov 12, 2018 · 7ce0f55 · 7ce0f55
1 parent f651e8f
commit 7ce0f55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -4,6 +4,7 @@
 	<title>ascii camera</title>
 	<meta charset="utf-8" />
  	<link rel="stylesheet" href="css/main.css"/>
+	<meta name="mobile-web-app-capable" content="yes">
 </head>
 <body>
 	<h1 id="info">Please allow this page to access your camera.</h1>

diff --git a/script/camera.js b/script/camera.js
@@ -15,20 +15,23 @@ var camera = (function() {
 		video = document.createElement("video");
 		video.setAttribute('width', options.width);
 		video.setAttribute('height', options.height);
+		video.setAttribute('playsinline', 'true');
+		video.setAttribute('webkit-playsinline', 'true');
 
 		navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
 		window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
 
 		if (navigator.getUserMedia) {
 			navigator.getUserMedia({
-				video: true
+				video: true,
+				audio: false,
 			}, function(stream) {
 				options.onSuccess();
 
 				if (video.mozSrcObject !== undefined) { // hack for Firefox < 19
 					video.mozSrcObject = stream;
 				} else {
-					video.src = (window.URL && window.URL.createObjectURL(stream)) || stream;
+					video.srcObject = stream;
 				}
 
 				initCanvas();
@@ -71,7 +74,7 @@ var camera = (function() {
 		if (video.mozSrcObject !== undefined) {
 			video.mozSrcObject = null;
 		} else {
-			video.src = "";
+			video.srcObject = null;
 		}
 	}