WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some pre-commit cleanup of media-grid.js and media-views.js 

Built from https://develop.svn.wordpress.org/trunk@29494


git-svn-id: http://core.svn.wordpress.org/trunk@29272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-08-15 01:13:16 +00:00
parent 6b3a4e6ddd
commit 81815c4d03
7 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/css/common-rtl.css
View File

@ -2255,6 +2255,7 @@ div.action-links {
left: 0;
right: 0;
min-height: 100%;
min-height: -webkit-calc( 100% - 346px );
min-height: calc( 100% - 346px );
}

1
wp-admin/css/common.css
View File

@ -2255,6 +2255,7 @@ div.action-links {
right: 0;
left: 0;
min-height: 100%;
min-height: -webkit-calc( 100% - 346px );
min-height: calc( 100% - 346px );
}

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/media-grid.js
View File

@ -1,4 +1,4 @@
/* global _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings, confirm */
/* global _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings */
(function($, _, Backbone, wp) {
// Local reference to the WordPress media namespace.
var media = wp.media, l10n;
@ -157,7 +157,7 @@
}
$browser = this.$('.attachments-browser');
$toolbar = $browser.find('.media-toolbar')
$toolbar = $browser.find('.media-toolbar');
if ( $browser.offset().top < this.$window.scrollTop() + this.$adminBar.height() ) {
$browser.addClass( 'fixed' );

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

@ -5718,8 +5718,9 @@
priority: 50
};
if ( media.view.settings.mediaTrash
&& this.controller.activeModes.where( { id: 'grid' } ).length ) {
if ( media.view.settings.mediaTrash &&
this.controller.activeModes.where( { id: 'grid' } ).length ) {
filters.trash = {
text: l10n.trash,
props: {
@ -5882,9 +5883,10 @@
return;
}
if ( media.view.settings.mediaTrash
&& 'trash' !== selection.at( 0 ).get( 'status' )
&& ! confirm( l10n.warnBulkTrash ) ) {
if ( media.view.settings.mediaTrash &&
'trash' !== selection.at( 0 ).get( 'status' ) &&
! confirm( l10n.warnBulkTrash ) ) {
return;
}
@ -6514,8 +6516,9 @@
var library = this.controller.library;
event.preventDefault();
if ( media.view.settings.mediaTrash
&& 'edit-metadata' === this.controller.content.mode() ) {
if ( media.view.settings.mediaTrash &&
'edit-metadata' === this.controller.content.mode() ) {
this.model.set( 'status', 'trash' );
this.model.save().done( function() {
library._requery( true );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.0-beta3-20140814';
$wp_version = '4.0-beta3-20140815';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.