summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-04 06:26:52 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-04 06:26:52 +0000
commitb0ccdd86ea9f1229e7ea5dd1b28db23815470590 (patch)
treedac07f6f05df8b1a87a3c3e294a8bf98bf1af653 /modules
parenta00ddd79ca956eedd1c0d8fc1758df2d8e7e9d93 (diff)
downloadbrdo-b0ccdd86ea9f1229e7ea5dd1b28db23815470590.tar.gz
brdo-b0ccdd86ea9f1229e7ea5dd1b28db23815470590.tar.bz2
#477018 by tic2000: Fix falsely-triggered JS alert when moving blocks.
Diffstat (limited to 'modules')
-rw-r--r--modules/block/block.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/block/block.js b/modules/block/block.js
index b722d30df..34c04d246 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.