Pull merge.

[yaffs-website] / web / core / modules / block / js / block.admin.js

diff --git a/web/core/modules/block/js/block.admin.js b/web/core/modules/block/js/block.admin.js
index 7cafed16ac64cf2108a40a7c33a39312cc0dadef..641f12d3f3a09c53b9d003657078e7ffc3750353 100644 (file)
--- a/web/core/modules/block/js/block.admin.js
+++ b/web/core/modules/block/js/block.admin.js
@@ -41,7 +41,7 @@
 
   Drupal.behaviors.blockHighlightPlacement = {
     attach: function attach(context, settings) {
-      if (settings.blockPlacement) {
+      if (settings.blockPlacement && $('.js-block-placed').length) {
         $(context).find('[data-drupal-selector="edit-blocks"]').once('block-highlight').each(function () {
           var $container = $(this);