<!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][10049] trunk/src/bp-core: BuddyPress Uploader: avoid duplicate ids in warnings</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/10049">10049</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/10049","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>2015-08-14 08:37:22 +0000 (Fri, 14 Aug 2015)</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'>BuddyPress Uploader: avoid duplicate ids in warnings
The BuddyPress Uploader is displaying some warnings to inform the user when something went not great while trying to upload a file (eg: file is too big).
In case of multi uploads, we need to make sure these warnings are not using the same id, and to remove them all when a new upload starts.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6590">#6590</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorecssavatarrtlcss">trunk/src/bp-core/css/avatar-rtl.css</a></li>
<li><a href="#trunksrcbpcorecssavatarcss">trunk/src/bp-core/css/avatar.css</a></li>
<li><a href="#trunksrcbpcorejsbppluploadjs">trunk/src/bp-core/js/bp-plupload.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorecssavatarrtlcss"></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/css/avatar-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/css/avatar-rtl.css 2015-08-12 23:32:44 UTC (rev 10048)
+++ trunk/src/bp-core/css/avatar-rtl.css 2015-08-14 08:37:22 UTC (rev 10049)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 15px;
</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">-#bp-uploader-warning, #bp-webcam-message p.warning {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#buddypress p.warning {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #ffd;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #cb2;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #440;
</span></span></pre></div>
<a id="trunksrcbpcorecssavatarcss"></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/css/avatar.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/css/avatar.css 2015-08-12 23:32:44 UTC (rev 10048)
+++ trunk/src/bp-core/css/avatar.css 2015-08-14 08:37:22 UTC (rev 10049)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 15px;
</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">-#bp-uploader-warning, #bp-webcam-message p.warning {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#buddypress p.warning {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #ffd;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #cb2;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #440;
</span></span></pre></div>
<a id="trunksrcbpcorejsbppluploadjs"></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/bp-plupload.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/js/bp-plupload.js 2015-08-12 23:32:44 UTC (rev 10048)
+++ trunk/src/bp-core/js/bp-plupload.js 2015-08-14 08:37:22 UTC (rev 10049)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,8 +303,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> defaults: _.pick( BP_Uploader.settings.defaults, 'container', 'drop_element', 'browse_button' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.warning = null;
- this.model = new Backbone.Model( this.defaults );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.warnings = [];
+ this.model = new Backbone.Model( this.defaults );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.on( 'ready', this.initUploader );
</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">@@ -319,20 +319,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- this.warning = new bp.Views.uploaderWarning( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var warning = new bp.Views.uploaderWarning( {
</ins><span class="cx" style="display: block; padding: 0 10px"> value: message
</span><span class="cx" style="display: block; padding: 0 10px"> } ).render();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$el.after( this.warning.el );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.warnings.push( warning );
+
+ this.$el.after( warning.el );
</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"> resetWarning: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( _.isNull( this.warning ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === this.warnings.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- this.warning.remove();
- this.warning = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove all warning views
+ _.each( this.warnings, function( view ) {
+ view.remove();
+ } );
+
+ // Reset Warnings
+ this.warnings = [];
</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">@@ -340,7 +347,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Views.uploaderWarning = bp.View.extend( {
</span><span class="cx" style="display: block; padding: 0 10px"> tagName: 'p',
</span><span class="cx" style="display: block; padding: 0 10px"> className: 'warning',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id: 'bp-uploader-warning',
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.value = this.options.value;
</span></span></pre>
</div>
</div>
</body>
</html>