From bbcddbbb729302d9c53f51a44e437ed01ec1fb02 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 8 May 2015 20:09:58 +0000 Subject: [PATCH] When creating an `EmbedLink` view, don't add a spinner - it already exists in `Embed`. Use the value of `wp.media.controller.Embed.sensitivity` as the sensitivity value for the debounced method in `EmbedLink` to ensure that the spinner toggles don't stutter or overlap. Fixes #32036. git-svn-id: https://develop.svn.wordpress.org/trunk@32462 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/media-views.js | 6 ++---- src/wp-includes/js/media/controllers/embed.js | 2 +- src/wp-includes/js/media/views/embed/link.js | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js index 602d5a8957..b95539e9b4 100644 --- a/src/wp-includes/js/media-views.js +++ b/src/wp-includes/js/media-views.js @@ -503,7 +503,7 @@ Embed = wp.media.controller.State.extend({ }, // The amount of time used when debouncing the scan. - sensitivity: 200, + sensitivity: 400, initialize: function(options) { this.metadata = options.metadata; @@ -4533,8 +4533,6 @@ EmbedLink = wp.media.view.Settings.extend({ template: wp.template('embed-link-settings'), initialize: function() { - this.spinner = $(''); - this.$el.append( this.spinner[0] ); this.listenTo( this.model, 'change:url', this.updateoEmbed ); }, @@ -4551,7 +4549,7 @@ EmbedLink = wp.media.view.Settings.extend({ } this.fetch(); - }, 600 ), + }, wp.media.controller.Embed.sensitivity ), fetch: function() { var embed; diff --git a/src/wp-includes/js/media/controllers/embed.js b/src/wp-includes/js/media/controllers/embed.js index 7426d2cde5..a499db4fee 100644 --- a/src/wp-includes/js/media/controllers/embed.js +++ b/src/wp-includes/js/media/controllers/embed.js @@ -39,7 +39,7 @@ Embed = wp.media.controller.State.extend({ }, // The amount of time used when debouncing the scan. - sensitivity: 200, + sensitivity: 400, initialize: function(options) { this.metadata = options.metadata; diff --git a/src/wp-includes/js/media/views/embed/link.js b/src/wp-includes/js/media/views/embed/link.js index d96c0d0e6d..0473ca692f 100644 --- a/src/wp-includes/js/media/views/embed/link.js +++ b/src/wp-includes/js/media/views/embed/link.js @@ -17,8 +17,6 @@ EmbedLink = wp.media.view.Settings.extend({ template: wp.template('embed-link-settings'), initialize: function() { - this.spinner = $(''); - this.$el.append( this.spinner[0] ); this.listenTo( this.model, 'change:url', this.updateoEmbed ); }, @@ -35,7 +33,7 @@ EmbedLink = wp.media.view.Settings.extend({ } this.fetch(); - }, 600 ), + }, wp.media.controller.Embed.sensitivity ), fetch: function() { var embed;