Ticket #6846: 6846.02.patch

src/bp-core/bp-core-avatars.php

@@ -1936 +1936 @@
  * @return bool True to load the Webcam Avatar UI part. False otherwise.
  */
 function bp_avatar_use_webcam() {
-        global $is_safari, $is_IE;
+        global $is_safari, $is_IE, $is_chrome;
 
         /**
          * Do not use the webcam feature for mobile devices
@@ -1951 +1951 @@
          *
          * @see  http://caniuse.com/#feat=stream
          */
-        if ( $is_safari || $is_IE ) {
+        if ( $is_safari || $is_IE || ( $is_chrome && ! is_ssl() ) ) {
                 return false;
         }
 

src/bp-core/css/avatar.css

@@ -170 +170 @@
         text-align: center;
 }
 
-.drag-drop-inside p.drag-drop-info {margin-top: 0;}
+.drag-drop-inside p.drag-drop-info {
+        display: block;
+        margin-top: 0;
+}
 
 #avatar-to-crop {
         margin: 0 auto 20px ;

src/bp-core/js/bp-plupload.js

@@ -330 +330 @@
 
                 initUploader: function() {
                         this.uploader = new bp.Uploader.uploader();
+                        this.uploader.uploader.refresh();
                         $( this.uploader ).on( 'bp-uploader-warning', _.bind( this.setWarning, this ) );
                         $( this.uploader ).on( 'bp-uploader-new-upload', _.bind( this.resetWarning, this ) );
                 },

src/bp-core/js/webcam.js

@@ -89 +89 @@
                         } else if ( navigator.mozGetUserMedia ) {
                                 video.src = stream;
                                 video.play();
+                        } else if ( video.srcObject !== undefined ) {
+                                video.srcObject = stream;
                         } else if ( window.URL ) {
                                 video.src = window.URL.createObjectURL( stream );
                         } else {
@@ -212 +214 @@
                         bp.WebCam.displayWarning( 'requesting' );
 
                         if ( navigator.getUserMedia ) {
-                                navigator.getUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCams.noStream );
+                                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 ) {