Ticket #6846: 6846.06.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;
+        visibility: hidden;
+        margin-top: 0;
+}
+
+.drag-drop .drag-drop-inside p.drag-drop-info {
+        visibility: visible;
+}
 
 #avatar-to-crop {
         margin: 0 auto 20px ;

src/bp-core/js/avatar.js

@@ -15 +15 @@
 
         bp.Avatar = {
                 start: function() {
+                        var self = this;
+
                         /**
                          * Remove the bp-legacy UI
                          *
@@ -42 +44 @@
 
                         /**
                          * In Administration screens we're using Thickbox
-                         * We need to make sure to reset the views if it's closed
+                         * We need to make sure to reset the views if it's closed or opened
                          */
                         $( 'body.wp-admin' ).on( 'tb_unload', '#TB_window', function() {
-                                // Reset to the uploader view
-                                bp.Avatar.nav.trigger( 'bp-avatar-view:changed', 'upload' );
-
-                                // Reset to the uploader nav
-                                _.each( bp.Avatar.navItems.models, function( model ) {
-                                        if ( model.id === 'upload' ) {
-                                                model.set( { active: 1 } );
-                                        } else {
-                                                model.set( { active: 0 } );
-                                        }
-                                } );
+                                self.resetViews();
+                        } );
+
+                        $( 'body.wp-admin' ).on( 'click', '.bp-xprofile-avatar-user-edit', function() {
+                                self.resetViews();
                         } );
                 },
 
@@ -122 +118 @@
                         }
                 },
 
+                resetViews: function() {
+                        // Reset to the uploader view
+                        this.nav.trigger( 'bp-avatar-view:changed', 'upload' );
+
+                        // Reset to the uploader nav
+                        _.each( this.navItems.models, function( model ) {
+                                if ( model.id === 'upload' ) {
+                                        model.set( { active: 1 } );
+                                } else {
+                                        model.set( { active: 0 } );
+                                }
+                        } );
+                },
+
                 setupNav: function() {
                         var self = this,
                             initView, activeView;

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 ) {