diff --git src/bp-core/css/avatar.css src/bp-core/css/avatar.css
index d3434e4..62de4cd 100644
|
|
div.bp-avatar-status .bp-bar { |
49 | 49 | padding: 10px 15px; |
50 | 50 | } |
51 | 51 | |
52 | | #bp-uploader-warning, #bp-webcam-message p.warning { |
| 52 | #buddypress p.warning { |
53 | 53 | background-color: #ffd; |
54 | 54 | border: 1px solid #cb2; |
55 | 55 | color: #440; |
diff --git src/bp-core/js/bp-plupload.js src/bp-core/js/bp-plupload.js
index 48106e8..0e1d538 100644
|
|
window.bp = window.bp || _.omit( window.wp, ['Uploader', 'emoji'] ); |
303 | 303 | defaults: _.pick( BP_Uploader.settings.defaults, 'container', 'drop_element', 'browse_button' ), |
304 | 304 | |
305 | 305 | initialize: function() { |
306 | | this.warning = null; |
307 | | this.model = new Backbone.Model( this.defaults ); |
| 306 | this.warnings = []; |
| 307 | this.model = new Backbone.Model( this.defaults ); |
308 | 308 | this.on( 'ready', this.initUploader ); |
309 | 309 | }, |
310 | 310 | |
… |
… |
window.bp = window.bp || _.omit( window.wp, ['Uploader', 'emoji'] ); |
319 | 319 | return; |
320 | 320 | } |
321 | 321 | |
322 | | this.warning = new bp.Views.uploaderWarning( { |
| 322 | var warning = new bp.Views.uploaderWarning( { |
323 | 323 | value: message |
324 | 324 | } ).render(); |
325 | 325 | |
326 | | this.$el.after( this.warning.el ); |
| 326 | this.warnings.push( warning ); |
| 327 | |
| 328 | this.$el.after( warning.el ); |
327 | 329 | }, |
328 | 330 | |
329 | 331 | resetWarning: function() { |
330 | | if ( _.isNull( this.warning ) ) { |
| 332 | if ( 0 === this.warnings.length ) { |
331 | 333 | return; |
332 | 334 | } |
333 | 335 | |
334 | | this.warning.remove(); |
335 | | this.warning = null; |
| 336 | // Remove all warning views |
| 337 | _.each( this.warnings, function( view ) { |
| 338 | view.remove(); |
| 339 | } ); |
| 340 | |
| 341 | // Reset Warnings |
| 342 | this.warnings = []; |
336 | 343 | } |
337 | 344 | } ); |
338 | 345 | |
… |
… |
window.bp = window.bp || _.omit( window.wp, ['Uploader', 'emoji'] ); |
340 | 347 | bp.Views.uploaderWarning = bp.View.extend( { |
341 | 348 | tagName: 'p', |
342 | 349 | className: 'warning', |
343 | | id: 'bp-uploader-warning', |
344 | 350 | |
345 | 351 | initialize: function() { |
346 | 352 | this.value = this.options.value; |