Commit 9022d6d7 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

заглушка для http://bugzserver/show_bug.cgi?id=27340

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59436 954022d7-b5bf-4e40-9824-e11837661b57
parent 8313434c
......@@ -2371,9 +2371,9 @@
result = true;
}
//если выделенная область находится до а/ф
if(activeCells.c2 < tableRange.c1 && activeCells.r1 <= tableRange.r1 && activeCells.r2 >= tableRange.r2 && (DeleteCellsAndShiftLeft || InsertCellsAndShiftRight))
if(activeCells.c2 < tableRange.c1 && activeCells.r1 <= tableRange.r1 && activeCells.r2 >= tableRange.r2 /*&& (DeleteCellsAndShiftLeft || InsertCellsAndShiftRight)*/)
result = true;
else if(activeCells.r2 < tableRange.r1 && activeCells.c1 <= tableRange.c1 && activeCells.c2 >= tableRange.c2 && (InsertCellsAndShiftDown || DeleteCellsAndShiftTop))
else if(activeCells.r2 < tableRange.r1 && activeCells.c1 <= tableRange.c1 && activeCells.c2 >= tableRange.c2 /*&& (InsertCellsAndShiftDown || DeleteCellsAndShiftTop)*/)
result = true;
}
......@@ -2405,6 +2405,10 @@
var activeCells = this._idToRange(conFilter.cellId);
var indexFilter = this._findArrayFromAllFilter3(activeCells,conFilter.cellId);
if(indexFilter === undefined)
return;
var filtersOp = indexFilter.split(':');
var currentFilter;
if(filtersOp[0] == 'all')
......@@ -2515,6 +2519,10 @@
//**получаем нужный фильтр**
var indexFilter = this._findArrayFromAllFilter3(newAcCells,cellId);
if(indexFilter === undefined)
return;
var filtersOp = indexFilter.split(':');
var currentFilter;
......
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