Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#477018 by tic2000: Fix falsely-triggered JS alert when moving blocks.

merge-requests/26/head
Angie Byron 2009-08-04 06:26:52 +00:00
parent a00ddd79ca
commit b0ccdd86ea
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/block/block.js
View File

@ -25,7 +25,9 @@ Drupal.behaviors.blockDrag = {
// Add a handler so when a row is dropped, update fields dropped into new regions. // Add a handler so when a row is dropped, update fields dropped into new regions.
tableDrag.onDrop = function () { tableDrag.onDrop = function () {
dragObject = this; 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 regionName = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
var regionField = $('select.block-region-select', dragObject.rowObject.element); var regionField = $('select.block-region-select', dragObject.rowObject.element);
// Check whether the newly picked region is available for this block. // Check whether the newly picked region is available for this block.