Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Media: Bring back spinners, now without bouncing select elements.

Browse Source 
props afercia for the initial patch.
see #22839, #30725.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2015-04-09 20:35:28 +00:00
parent 8d01d0be3f
commit d99c2b41ca
9 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/css/media-views-rtl.css
View File

@ -1509,12 +1509,19 @@
background: url(../images/spinner.gif) no-repeat;
-webkit-background-size: 20px 20px;
background-size: 20px 20px;
display: none;
float: left;
display: inline-block;
visibility: hidden;
opacity: 0.7;
filter: alpha(opacity=70);
width: 20px;
height: 20px;
margin: 0;
vertical-align: middle;
}
.media-frame .spinner.is-active {
visibility: visible;
}
.media-toolbar .spinner {
@ -1536,7 +1543,7 @@
}
.attachment-details .settings-save-status .spinner {
margin: 0 5px 0;
margin-right: 5px;
}
.attachment-details .settings-save-status .saved {
@ -1544,7 +1551,10 @@
display: none;
}
.attachment-details.save-waiting .settings-save-status .spinner,
.attachment-details.save-waiting .settings-save-status .spinner {
visibility: visible;
}
.attachment-details.save-complete .settings-save-status .saved {
display: block;
}
@ -1787,7 +1797,7 @@
}
.media-frame .embed-loading .embed-url .spinner {
display: block;
visibility: visible;
}
.embed-link-settings,

2
wp-includes/css/media-views-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
wp-includes/css/media-views.css
View File

@ -1509,12 +1509,19 @@
background: url(../images/spinner.gif) no-repeat;
-webkit-background-size: 20px 20px;
background-size: 20px 20px;
display: none;
float: right;
display: inline-block;
visibility: hidden;
opacity: 0.7;
filter: alpha(opacity=70);
width: 20px;
height: 20px;
margin: 0;
vertical-align: middle;
}
.media-frame .spinner.is-active {
visibility: visible;
}
.media-toolbar .spinner {
@ -1536,7 +1543,7 @@
}
.attachment-details .settings-save-status .spinner {
margin: 0 5px 0;
margin-left: 5px;
}
.attachment-details .settings-save-status .saved {
@ -1544,7 +1551,10 @@
display: none;
}
.attachment-details.save-waiting .settings-save-status .spinner,
.attachment-details.save-waiting .settings-save-status .spinner {
visibility: visible;
}
.attachment-details.save-complete .settings-save-status .saved {
display: block;
}
@ -1787,7 +1797,7 @@
}
.media-frame .embed-loading .embed-url .spinner {
display: block;
visibility: visible;
}
.embed-link-settings,

2
wp-includes/css/media-views.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -4546,8 +4546,6 @@ EmbedLink = wp.media.view.Settings.extend({
return;
}
this.spinner.show();
this.fetch();
}, 600 ),
@ -4607,8 +4605,6 @@ EmbedLink = wp.media.view.Settings.extend({
this.model.unset( 'width', opts );
}
this.spinner.hide();
this.$('.embed-container').show().find('.embed-preview').html( html );
}
});
@ -7463,7 +7459,7 @@ var Spinner = wp.media.View.extend({
show: function() {
if ( ! this.spinnerTimeout ) {
this.spinnerTimeout = _.delay(function( $el ) {
$el.show();
$el.addClass( 'is-active' );
}, this.delay, this.$el );
}
@ -7471,7 +7467,7 @@ var Spinner = wp.media.View.extend({
},
hide: function() {
this.$el.hide();
this.$el.removeClass( 'is-active' );
this.spinnerTimeout = clearTimeout( this.spinnerTimeout );
return this;

4
wp-includes/js/media/views.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/media/views/embed/link.js
View File

@ -34,8 +34,6 @@ EmbedLink = wp.media.view.Settings.extend({
return;
}
this.spinner.show();
this.fetch();
}, 600 ),
@ -95,8 +93,6 @@ EmbedLink = wp.media.view.Settings.extend({
this.model.unset( 'width', opts );
}
this.spinner.hide();
this.$('.embed-container').show().find('.embed-preview').html( html );
}
});

4
wp-includes/js/media/views/spinner.js
View File

@ -17,7 +17,7 @@ var Spinner = wp.media.View.extend({
show: function() {
if ( ! this.spinnerTimeout ) {
this.spinnerTimeout = _.delay(function( $el ) {
$el.show();
$el.addClass( 'is-active' );
}, this.delay, this.$el );
}
@ -25,7 +25,7 @@ var Spinner = wp.media.View.extend({
},
hide: function() {
this.$el.hide();
this.$el.removeClass( 'is-active' );
this.spinnerTimeout = clearTimeout( this.spinnerTimeout );
return this;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta4-32100';
$wp_version = '4.2-beta4-32101';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.