Changeset 10049

Timestamp:

08/14/2015 08:37:22 AM (9 years ago)

Author:

imath

Message:

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 #6590

Location:

trunk/src/bp-core

Files:

• css/avatar-rtl.css (modified) (1 diff)
• css/avatar.css (modified) (1 diff)
• js/bp-plupload.js (modified) (3 diffs)

trunk/src/bp-core/css/avatar-rtl.css

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

trunk/src/bp-core/css/avatar.css

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

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

@@ -304 +304 @@
 
         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 );
         },
@@ -320 +320 @@
             }
 
-            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 = [];
         }
     } );
@@ -341 +348 @@
         tagName: 'p',
         className: 'warning',
-        id: 'bp-uploader-warning',
 
         initialize: function() {