Commit 0d21b82b authored by GoshaZotov's avatar GoshaZotov

change (>= && <=) -> contains function

parent 25077acc
...@@ -9172,7 +9172,7 @@ ...@@ -9172,7 +9172,7 @@
for (var mergeCheck = 0; mergeCheck < mergeArr.length; ++mergeCheck) { for (var mergeCheck = 0; mergeCheck < mergeArr.length; ++mergeCheck) {
var tempRow = row + 1; var tempRow = row + 1;
var tempCol = col + 1; var tempCol = col + 1;
if (tempRow <= mergeArr[mergeCheck].r2 && tempRow >= mergeArr[mergeCheck].r1 && tempCol <= mergeArr[mergeCheck].c2 && tempCol >= mergeArr[mergeCheck].c1) { if (mergeArr[mergeCheck].contains(tempCol, tempRow)) {
isMerged = true; isMerged = true;
} }
} }
...@@ -9388,7 +9388,7 @@ ...@@ -9388,7 +9388,7 @@
var isMerged = false; var isMerged = false;
for (var mergeCheck = 0; mergeCheck < mergeArr.length; ++mergeCheck) { for (var mergeCheck = 0; mergeCheck < mergeArr.length; ++mergeCheck) {
if (nRow <= mergeArr[mergeCheck].r2 && nRow >= mergeArr[mergeCheck].r1 && nCol <= mergeArr[mergeCheck].c2 && nCol >= mergeArr[mergeCheck].c1) { if (mergeArr[mergeCheck].contains(nCol, nRow)) {
isMerged = true; isMerged = true;
} }
} }
......
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