Commit 234e44e9 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug #33834.

parent 941e8d1c
......@@ -8270,6 +8270,8 @@ CTable.prototype =
var Grid_end = -1;
var RowsInfo = [];
var nRowMin = -1;
var nRowMax = -1;
for ( var Index = 0; Index < this.Selection.Data.length; Index++ )
{
......@@ -8291,6 +8293,12 @@ CTable.prototype =
Grid_start : StartGridCol,
Grid_end : EndGridCol
};
if (-1 === nRowMax || RowIndex > nRowMax)
nRowMax = RowIndex;
if (-1 === nRowMin || RowIndex < nRowMin)
nRowMin = RowIndex;
}
else
{
......@@ -8303,6 +8311,16 @@ CTable.prototype =
}
}
// Проверим, что селект строк идет без пропусков
for (var nRowIndex = nRowMin; nRowIndex <= nRowMax; ++nRowIndex)
{
if (!RowsInfo[nRowIndex])
{
bCanMerge = false;
break;
}
}
for ( var Index in RowsInfo )
{
if ( -1 === Grid_start )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment