Ticket #24859: 24859.4.diff
File 24859.4.diff, 2.4 KB (added by , 11 years ago) |
---|
-
wp-includes/css/media-views.css
1290 1290 margin: 0; 1291 1291 } 1292 1292 1293 .media-toolbar .spinner { 1294 display: inline-block; 1295 margin-top: 14px; 1296 } 1297 1293 1298 .media-sidebar .settings-save-status { 1294 1299 background: #f5f5f5; 1295 1300 float: right; -
wp-includes/js/media-views.js
5237 5237 media.view.AttachmentsBrowser = media.View.extend({ 5238 5238 tagName: 'div', 5239 5239 className: 'attachments-browser', 5240 showSpinner: false, 5240 5241 5241 5242 initialize: function() { 5242 5243 _.defaults( this.options, { … … 5253 5254 5254 5255 this.collection.on( 'add remove reset', this.updateContent, this ); 5255 5256 }, 5257 5258 toggleSpinner: function( toggle ) { 5259 this.showSpinner = toggle; 5260 5261 if ( this.showSpinner ) { 5262 // Delay showing spinner, catch when toggled before delay is finished 5263 _.delay( function( view ) { 5264 if ( view.showSpinner ) { 5265 view.toolbar.get('spinner').show(); 5266 } 5267 }, 600, this ); 5268 } else { 5269 this.showSpinner = false; 5270 this.toolbar.get('spinner').hide(); 5271 } 5272 }, 5273 5256 5274 /** 5257 5275 * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining 5258 5276 */ … … 5289 5307 }).render() ); 5290 5308 } 5291 5309 5310 this.toolbar.set( 'spinner', new media.view.Spinner({ 5311 priority: -70 5312 }) ); 5313 5292 5314 if ( this.options.search ) { 5293 5315 this.toolbar.set( 'search', new media.view.Search({ 5294 5316 controller: this.controller, … … 5313 5335 } 5314 5336 5315 5337 if ( ! this.collection.length ) { 5338 this.toggleSpinner( true ); 5316 5339 this.collection.more().done( function() { 5317 5340 if ( ! view.collection.length ) { 5318 5341 view.createUploader(); 5319 5342 } 5343 view.toggleSpinner( false ); 5320 5344 }); 5321 5345 } 5322 5346 }, … … 6326 6350 this.$( '.embed-media-settings' ).scrollTop( 0 ); 6327 6351 } 6328 6352 }); 6353 6354 /** 6355 * wp.media.view.Spinner 6356 * 6357 * @constructor 6358 * @augments wp.media.View 6359 * @augments wp.Backbone.View 6360 * @augments Backbone.View 6361 */ 6362 media.view.Spinner = media.View.extend({ 6363 tagName: 'span', 6364 className: 'spinner', 6365 6366 show: function() { 6367 this.$el.show(); 6368 return this; 6369 }, 6370 6371 hide: function() { 6372 this.$el.hide(); 6373 return this; 6374 } 6375 }); 6329 6376 }(jQuery, _));