Merge branch 'patch-1' of git://github.com/hannosch/html5demos into hannosch-patch-1

This commit is contained in:
Remy Sharp 2012-12-11 19:48:05 +00:00
commit 84e3adb906
1 changed files with 2 additions and 2 deletions

View File

@ -33,7 +33,7 @@ var video = document.getElementById('video'),
gum = document.getElementById('gum');
function init() {
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia;
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
if (navigator.getUserMedia) {
// NOTE: at time of writing March 26, 2012, audio isn't working in Chrome
// navigator.getUserMedia('audio,video', successCallback, errorCallback);
@ -55,7 +55,7 @@ function init() {
}
}
if (navigator.getUserMedia || navigator.webkitGetUserMedia) {
if (navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia) {
article.removeChild(gum);
article.className = 'supported';
init();