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 afc9b0ba44210cf00b8d85185970be363d5f73de..641f12d3f3a09c53b9d003657078e7ffc3750353 100644 (file)
--- a/web/core/modules/block/js/block.admin.js
+++ b/web/core/modules/block/js/block.admin.js
@@ -10,7 +10,7 @@
     attach: function attach(context, settings) {
       var $input = $('input.block-filter-text').once('block-filter-text');
       var $table = $($input.attr('data-element'));
-      var $filter_rows = void 0;
+      var $filterRows = void 0;
 
       function filterBlockList(e) {
         var query = $(e.target).val().toLowerCase();
@@ -23,17 +23,17 @@
         }
 
         if (query.length >= 2) {
-          $filter_rows.each(toggleBlockEntry);
+          $filterRows.each(toggleBlockEntry);
           Drupal.announce(Drupal.formatPlural($table.find('tr:visible').length - 1, '1 block is available in the modified list.', '@count blocks are available in the modified list.'));
         } else {
-          $filter_rows.each(function (index) {
+          $filterRows.each(function (index) {
             $(this).parent().parent().show();
           });
         }
       }
 
       if ($table.length) {
-        $filter_rows = $table.find('div.block-filter-text-source');
+        $filterRows = $table.find('div.block-filter-text-source');
         $input.on('keyup', debounce(filterBlockList, 200));
       }
     }
@@ -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);