Ticket #6590: 6590.patch

src/bp-core/css/avatar.css

@@ -49 +49 @@
         padding: 10px 15px;
 }
 
-#bp-uploader-warning, #bp-webcam-message p.warning {
+#buddypress p.warning {
         background-color: #ffd;
         border: 1px solid #cb2;
         color: #440;

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

@@ -303 +303 @@
                 defaults: _.pick( BP_Uploader.settings.defaults, 'container', 'drop_element', 'browse_button' ),
 
                 initialize: function() {
-                        this.warning = null;
-                        this.model = new Backbone.Model( this.defaults );
+                        this.warnings = [];
+                        this.model    = new Backbone.Model( this.defaults );
                         this.on( 'ready', this.initUploader );
                 },
 
@@ -319 +319 @@
                                 return;
                         }
 
-                        this.warning = new bp.Views.uploaderWarning( {
+                        var warning = new bp.Views.uploaderWarning( {
                                 value: message
                         } ).render();
 
-                        this.$el.after( this.warning.el );
+                        this.warnings.push( warning );
+
+                        this.$el.after( warning.el );
                 },
 
                 resetWarning: function() {
-                        if ( _.isNull( this.warning ) ) {
+                        if ( 0 === this.warnings.length ) {
                                 return;
                         }
 
-                        this.warning.remove();
-                        this.warning = null;
+                        // Remove all warning views
+                        _.each( this.warnings, function( view ) {
+                                view.remove();
+                        } );
+
+                        // Reset Warnings
+                        this.warnings = [];
                 }
         } );
 
@@ -340 +347 @@
         bp.Views.uploaderWarning = bp.View.extend( {
                 tagName: 'p',
                 className: 'warning',
-                id: 'bp-uploader-warning',
 
                 initialize: function() {
                         this.value = this.options.value;