From b0ccdd86ea9f1229e7ea5dd1b28db23815470590 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 4 Aug 2009 06:26:52 +0000
Subject: [PATCH] #477018 by tic2000: Fix falsely-triggered JS alert when
 moving blocks.

---
 modules/block/block.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/block/block.js b/modules/block/block.js
index b722d30df01..34c04d2460c 100644
--- a/modules/block/block.js
+++ b/modules/block/block.js
@@ -25,7 +25,9 @@ Drupal.behaviors.blockDrag = {
     // Add a handler so when a row is dropped, update fields dropped into new regions.
     tableDrag.onDrop = function () {
       dragObject = this;
-      var regionRow = $(dragObject.rowObject.element).prev('tr').get(0);
+      // Use "region-message" row instead of "region" row because
+      // "region-{region_name}-message" is less prone to regexp match errors.
+      var regionRow = $(dragObject.rowObject.element).prevAll('tr.region-message').get(0);
       var regionName = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
       var regionField = $('select.block-region-select', dragObject.rowObject.element);
       // Check whether the newly picked region is available for this block.