Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-07-04 10:45:33 +02:00
Code Issues Projects Releases Wiki Activity

Media: Don't try to resize the bottom selection UI. props koopersmith. fixes #22748.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@23056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-12-05 01:38:44 +00:00
parent dc9e6144be
commit e1405b6f1d
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wp-includes/js/media-views.js
View File

@ -3111,7 +3111,8 @@
refreshSensitivity: 200,
refreshThreshold: 3,
AttachmentView: media.view.Attachment,
sortable: false
sortable: false,
resize: true
});
this._viewsByCid = {};
@ -3140,7 +3141,8 @@
_.bindAll( this, 'css' );
this.model.on( 'change:edge change:gutter', this.css, this );
this._resizeCss = _.debounce( _.bind( this.css, this ), this.refreshSensitivity );
$(window).on( 'resize.attachments', this._resizeCss );
if ( this.options.resize )
$(window).on( 'resize.attachments', this._resizeCss );
this.css();
},
@ -3170,7 +3172,6 @@
if ( ! this.$el.is(':visible') )
return edge;
gutter = this.model.get('gutter') * 2;
width = this.$el.width() - gutter;
columns = Math.ceil( width / ( edge + gutter ) );
@ -3667,18 +3668,14 @@
clearable: true
});
this.attachments = new media.view.Attachments({
this.attachments = new media.view.Attachments.Selection({
controller: this.controller,
collection: this.collection,
selection: this.collection,
sortable: true,
model: new Backbone.Model({
edge: 40,
gutter: 5
}),
// The single `Attachment` view to be used in the `Attachments` view.
AttachmentView: media.view.Attachment.Selection
})
});
this.views.set( '.selection-view', this.attachments );
@ -3732,6 +3729,26 @@
}
});
/**
* wp.media.view.Attachments.Selection
*/
media.view.Attachments.Selection = media.view.Attachments.extend({
events: {},
initialize: function() {
_.defaults( this.options, {
sortable: true,
resize: false,
// The single `Attachment` view to be used in the `Attachments` view.
AttachmentView: media.view.Attachment.Selection
});
return media.view.Attachments.prototype.initialize.apply( this, arguments );
}
});
/**
* wp.media.view.Attachments.EditSelection
*/
media.view.Attachment.EditSelection = media.view.Attachment.Selection.extend({
buttons: {
close: true