<!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][10495] branches/2.4/src/bp-core: Make sure the Avatar UI behaves the right way in Microsoft Edge & Chrome</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 { 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/10495">10495</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/10495","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-02 19:53:52 +0000 (Tue, 02 Feb 2016)</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'>Make sure the Avatar UI behaves the right way in Microsoft Edge & Chrome
- Use, if needed, MS Edge specific attribute for the video stream (`srcObject`).
- Make sure Plupload Uploader is also ready for MS Edge within the `wp-admin/profile` screen.
- Make sure the "Browse" button works the right way in MS Edge.
- About the Chrome Browser: only load the webcam script if the website is using ssl.
see <a href="http://buddypress.trac.wordpress.org/ticket/6846">#6846</a> (branch 2.4)
props r-a-y, hnla</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches24srcbpcorebpcoreavatarsphp">branches/2.4/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#branches24srcbpcorecssavatarrtlcss">branches/2.4/src/bp-core/css/avatar-rtl.css</a></li>
<li><a href="#branches24srcbpcorecssavatarcss">branches/2.4/src/bp-core/css/avatar.css</a></li>
<li><a href="#branches24srcbpcorejsavatarjs">branches/2.4/src/bp-core/js/avatar.js</a></li>
<li><a href="#branches24srcbpcorejswebcamjs">branches/2.4/src/bp-core/js/webcam.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches24srcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.4/src/bp-core/bp-core-avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.4/src/bp-core/bp-core-avatars.php 2016-02-02 19:42:35 UTC (rev 10494)
+++ branches/2.4/src/bp-core/bp-core-avatars.php 2016-02-02 19:53:52 UTC (rev 10495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1948,7 +1948,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True to load the Webcam Avatar UI part. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_avatar_use_webcam() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $is_safari, $is_IE;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $is_safari, $is_IE, $is_chrome;
</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"> * Do not use the webcam feature for mobile devices
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1963,7 +1963,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see http://caniuse.com/#feat=stream
</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 ( $is_safari || $is_IE ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_safari || $is_IE || ( $is_chrome && ! is_ssl() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches24srcbpcorecssavatarrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.4/src/bp-core/css/avatar-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.4/src/bp-core/css/avatar-rtl.css 2016-02-02 19:42:35 UTC (rev 10494)
+++ branches/2.4/src/bp-core/css/avatar-rtl.css 2016-02-02 19:53:52 UTC (rev 10495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,8 +170,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.drag-drop-inside p.drag-drop-info {margin-top: 0;}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.drag-drop-inside p.drag-drop-info {
+ margin-top: 0;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@supports (-ms-accelerator:true) {
+ .drag-drop-inside p.drag-drop-info {
+ display: block;
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #avatar-to-crop {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 auto 20px ;
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: right;
</span></span></pre></div>
<a id="branches24srcbpcorecssavatarcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.4/src/bp-core/css/avatar.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.4/src/bp-core/css/avatar.css 2016-02-02 19:42:35 UTC (rev 10494)
+++ branches/2.4/src/bp-core/css/avatar.css 2016-02-02 19:53:52 UTC (rev 10495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,8 +170,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.drag-drop-inside p.drag-drop-info {margin-top: 0;}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.drag-drop-inside p.drag-drop-info {
+ margin-top: 0;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@supports (-ms-accelerator:true) {
+ .drag-drop-inside p.drag-drop-info {
+ display: block;
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #avatar-to-crop {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 auto 20px ;
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: left;
</span></span></pre></div>
<a id="branches24srcbpcorejsavatarjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.4/src/bp-core/js/avatar.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.4/src/bp-core/js/avatar.js 2016-02-02 19:42:35 UTC (rev 10494)
+++ branches/2.4/src/bp-core/js/avatar.js 2016-02-02 19:53:52 UTC (rev 10495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Avatar = {
</span><span class="cx" style="display: block; padding: 0 10px"> start: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var self = this;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove the bp-legacy UI
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,20 +44,14 @@
</span><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"> * In Administration screens we're using Thickbox
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * We need to make sure to reset the views if it's closed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * We need to make sure to reset the views if it's closed or opened
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'body.wp-admin' ).on( 'tb_unload', '#TB_window', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reset to the uploader view
- bp.Avatar.nav.trigger( 'bp-avatar-view:changed', 'upload' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.resetViews();
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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 } );
- }
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( 'body.wp-admin' ).on( 'click', '.bp-xprofile-avatar-user-edit', function() {
+ self.resetViews();
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,6 +118,20 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 } );
+ }
+ } );
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setupNav: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var self = this,
</span><span class="cx" style="display: block; padding: 0 10px"> initView, activeView;
</span></span></pre></div>
<a id="branches24srcbpcorejswebcamjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.4/src/bp-core/js/webcam.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.4/src/bp-core/js/webcam.js 2016-02-02 19:42:35 UTC (rev 10494)
+++ branches/2.4/src/bp-core/js/webcam.js 2016-02-02 19:53:52 UTC (rev 10495)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,6 +89,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( navigator.mozGetUserMedia ) {
</span><span class="cx" style="display: block; padding: 0 10px"> video.src = stream;
</span><span class="cx" style="display: block; padding: 0 10px"> video.play();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( video.srcObject !== undefined ) {
+ video.srcObject = stream;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( window.URL ) {
</span><span class="cx" style="display: block; padding: 0 10px"> video.src = window.URL.createObjectURL( stream );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +214,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( navigator.getUserMedia ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- navigator.getUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCams.noStream );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ navigator.getUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( navigator.oGetUserMedia ) {
</span><span class="cx" style="display: block; padding: 0 10px"> navigator.oGetUserMedia( { video:true }, bp.WebCam.gotStream, bp.WebCam.noStream );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( navigator.mozGetUserMedia ) {
</span></span></pre>
</div>
</div>
</body>
</html>