diff --git src/bp-core/bp-core-avatars.php src/bp-core/bp-core-avatars.php
index b7cfe95..86a1282 100644
|
|
function bp_avatar_is_front_edit() { |
1936 | 1936 | * @return bool True to load the Webcam Avatar UI part. False otherwise. |
1937 | 1937 | */ |
1938 | 1938 | function bp_avatar_use_webcam() { |
1939 | | global $is_safari, $is_IE; |
| 1939 | global $is_safari, $is_IE, $is_chrome; |
1940 | 1940 | |
1941 | 1941 | /** |
1942 | 1942 | * Do not use the webcam feature for mobile devices |
… |
… |
function bp_avatar_use_webcam() { |
1951 | 1951 | * |
1952 | 1952 | * @see http://caniuse.com/#feat=stream |
1953 | 1953 | */ |
1954 | | if ( $is_safari || $is_IE ) { |
| 1954 | if ( $is_safari || $is_IE || ( $is_chrome && ! is_ssl() ) ) { |
1955 | 1955 | return false; |
1956 | 1956 | } |
1957 | 1957 | |
diff --git src/bp-core/css/avatar.css src/bp-core/css/avatar.css
index 2986dff..8a1fab8 100644
|
|
div.bp-avatar-nav { |
170 | 170 | text-align: center; |
171 | 171 | } |
172 | 172 | |
173 | | .drag-drop-inside p.drag-drop-info {margin-top: 0;} |
| 173 | .drag-drop-inside p.drag-drop-info { |
| 174 | display: block; |
| 175 | margin-top: 0; |
| 176 | } |
174 | 177 | |
175 | 178 | #avatar-to-crop { |
176 | 179 | margin: 0 auto 20px ; |
diff --git src/bp-core/js/avatar.js src/bp-core/js/avatar.js
index b410204..b27bc21 100644
|
|
window.bp = window.bp || {}; |
15 | 15 | |
16 | 16 | bp.Avatar = { |
17 | 17 | start: function() { |
| 18 | var self = this; |
| 19 | |
18 | 20 | /** |
19 | 21 | * Remove the bp-legacy UI |
20 | 22 | * |
… |
… |
window.bp = window.bp || {}; |
42 | 44 | |
43 | 45 | /** |
44 | 46 | * In Administration screens we're using Thickbox |
45 | | * We need to make sure to reset the views if it's closed |
| 47 | * We need to make sure to reset the views if it's closed or opened |
46 | 48 | */ |
47 | 49 | $( 'body.wp-admin' ).on( 'tb_unload', '#TB_window', function() { |
48 | | // Reset to the uploader view |
49 | | bp.Avatar.nav.trigger( 'bp-avatar-view:changed', 'upload' ); |
50 | | |
51 | | // Reset to the uploader nav |
52 | | _.each( bp.Avatar.navItems.models, function( model ) { |
53 | | if ( model.id === 'upload' ) { |
54 | | model.set( { active: 1 } ); |
55 | | } else { |
56 | | model.set( { active: 0 } ); |
57 | | } |
58 | | } ); |
| 50 | self.resetViews(); |
| 51 | } ); |
| 52 | |
| 53 | $( 'body.wp-admin' ).on( 'click', '.bp-xprofile-avatar-user-edit', function() { |
| 54 | self.resetViews(); |
59 | 55 | } ); |
60 | 56 | }, |
61 | 57 | |
… |
… |
window.bp = window.bp || {}; |
122 | 118 | } |
123 | 119 | }, |
124 | 120 | |
| 121 | resetViews: function() { |
| 122 | // Reset to the uploader view |
| 123 | this.nav.trigger( 'bp-avatar-view:changed', 'upload' ); |
| 124 | |
| 125 | // Reset to the uploader nav |
| 126 | _.each( this.navItems.models, function( model ) { |
| 127 | if ( model.id === 'upload' ) { |
| 128 | model.set( { active: 1 } ); |
| 129 | } else { |
| 130 | model.set( { active: 0 } ); |
| 131 | } |
| 132 | } ); |
| 133 | }, |
| 134 | |
125 | 135 | setupNav: function() { |
126 | 136 | var self = this, |
127 | 137 | initView, activeView; |
diff --git src/bp-core/js/webcam.js src/bp-core/js/webcam.js
index 4e86f1d..16ff039 100644
|
|
window.bp = window.bp || {}; |
89 | 89 | } else if ( navigator.mozGetUserMedia ) { |
90 | 90 | video.src = stream; |
91 | 91 | video.play(); |
| 92 | } else if ( video.srcObject !== undefined ) { |
| 93 | video.srcObject = stream; |
92 | 94 | } else if ( window.URL ) { |
93 | 95 | video.src = window.URL.createObjectURL( stream ); |
94 | 96 | } else { |
… |
… |
window.bp = window.bp || {}; |
212 | 214 | bp.WebCam.displayWarning( 'requesting' ); |
213 | 215 | |
214 | 216 | if ( navigator.getUserMedia ) { |
215 | | navigator.getUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCams.noStream ); |
| 217 | navigator.getUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream ); |
216 | 218 | } else if ( navigator.oGetUserMedia ) { |
217 | 219 | navigator.oGetUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream ); |
218 | 220 | } else if ( navigator.mozGetUserMedia ) { |