<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][11944] trunk/src/bp-core/js/webcam.js: Avatars: Fix webcam functionality when taking a photo in Firefox.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11944">11944</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11944","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-03 16:58:03 +0000 (Tue, 03 Apr 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Avatars: Fix webcam functionality when taking a photo in Firefox.
The `navigator.getUserMedia` API, which our webcam functionality relies on,
is deprecated. As a result, webcam functionality does not work in Firefox.
This commit addresses this by supporting the newer `navigator.mediaDevices`
API, while also adding backward-compatible support for those browsers that
still require `navigator.getUserMedia`.
Props r-a-y, DJPaul, hnla.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7676">#7676</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorejswebcamjs">trunk/src/bp-core/js/webcam.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorejswebcamjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/js/webcam.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/js/webcam.js 2018-04-03 11:35:57 UTC (rev 11943)
+++ trunk/src/bp-core/js/webcam.js 2018-04-03 16:58:03 UTC (rev 11944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,20 +83,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> stream.onended = bp.WebCam.noStream();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( video.mozSrcObject !== undefined ) {
- video.mozSrcObject = stream;
- video.play();
- } else if ( navigator.mozGetUserMedia ) {
- video.src = stream;
- video.play();
- } else if ( video.srcObject !== undefined ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Older browsers may not have srcObject
+ if ( 'srcObject' in video ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> video.srcObject = stream;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( window.URL ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // Avoid using this in new browsers, as it is going away.
</ins><span class="cx" style="display: block; padding: 0 10px"> video.src = window.URL.createObjectURL( stream );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- video.src = stream;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ video.onloadedmetadata = function() {
+ video.play();
+ };
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp.WebCam.params.capture_enable = true;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,8 +170,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var params;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( navigator.getUserMedia || navigator.oGetUserMedia || navigator.mozGetUserMedia || navigator.webkitGetUserMedia || navigator.msGetUserMedia ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Standardize getUserMedia browser call.
+ navigator.getUserMedia = (
+ navigator.getUserMedia ||
+ navigator.webkitGetUserMedia ||
+ navigator.mozGetUserMedia ||
+ navigator.msGetUserMedia ||
+ navigator.oGetUserMedia
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( typeof navigator.getUserMedia !== 'undefined' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // We need to add some cropping stuff to use bp.Avatar.setAvatar()
</span><span class="cx" style="display: block; padding: 0 10px"> params = _.extend( _.pick( BP_Uploader.settings.defaults.multipart_params.bp_params,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,19 +219,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // User Feedback
</span><span class="cx" style="display: block; padding: 0 10px"> bp.WebCam.displayWarning( 'requesting' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( navigator.getUserMedia ) {
- navigator.getUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream );
- } else if ( navigator.oGetUserMedia ) {
- navigator.oGetUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream );
- } else if ( navigator.mozGetUserMedia ) {
- navigator.mozGetUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream );
- } else if ( navigator.webkitGetUserMedia ) {
- navigator.webkitGetUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream );
- } else if (navigator.msGetUserMedia) {
- navigator.msGetUserMedia( { video:true, audio:false }, bp.WebCams.gotStream, bp.WebCam.noStream );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Use deprecated getUserMedia call for browsers that require it.
+ if ( typeof navigator.mediaDevices.getUserMedia === 'undefined' ) {
+ navigator.getUserMedia({
+ audio: false,
+ video: true
+ }, bp.WebCam.gotStream, bp.WebCam.noStream);
+
+ // Teh new hotness!
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // User Feedback
- bp.WebCam.displayWarning( 'errormsg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ navigator.mediaDevices.getUserMedia({
+ audio: false,
+ video: true
+ }).then(bp.WebCam.gotStream, bp.WebCam.noStream)
+ // ES3 compatibility.
+ ['catch'](function() {
+ // User Feedback
+ bp.WebCam.displayWarning( 'errormsg' );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>