Commit c580d4a6 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51222 954022d7-b5bf-4e40-9824-e11837661b57
parent 2ea2c6c9
...@@ -1581,7 +1581,7 @@ CAutoshapeTrack.prototype = ...@@ -1581,7 +1581,7 @@ CAutoshapeTrack.prototype =
if (x1 <= x2 && y1 <= y2) if (x1 <= x2 && y1 <= y2)
{ {
for (var i = x1, j = y1; i < x2 || j < y2; i += len_x2, j += len_y2) for (var i = x1, j = y1; i < x2 && j < y2; i += len_x2, j += len_y2)
{ {
ctx.moveTo(i, j); ctx.moveTo(i, j);
...@@ -1598,7 +1598,7 @@ CAutoshapeTrack.prototype = ...@@ -1598,7 +1598,7 @@ CAutoshapeTrack.prototype =
} }
else if (x1 <= x2 && y1 > y2) else if (x1 <= x2 && y1 > y2)
{ {
for (var i = x1, j = y1; i < x2 || j > y2; i += len_x2, j -= len_y2) for (var i = x1, j = y1; i < x2 && j > y2; i += len_x2, j -= len_y2)
{ {
ctx.moveTo(i, j); ctx.moveTo(i, j);
...@@ -1615,7 +1615,7 @@ CAutoshapeTrack.prototype = ...@@ -1615,7 +1615,7 @@ CAutoshapeTrack.prototype =
} }
else if (x1 > x2 && y1 <= y2) else if (x1 > x2 && y1 <= y2)
{ {
for (var i = x1, j = y1; i > x2 || j < y2; i -= len_x2, j += len_y2) for (var i = x1, j = y1; i > x2 && j < y2; i -= len_x2, j += len_y2)
{ {
ctx.moveTo(i, j); ctx.moveTo(i, j);
...@@ -1632,7 +1632,7 @@ CAutoshapeTrack.prototype = ...@@ -1632,7 +1632,7 @@ CAutoshapeTrack.prototype =
} }
else else
{ {
for (var i = x1, j = y1; i > x2 || j > y2; i -= len_x2, j -= len_y2) for (var i = x1, j = y1; i > x2 && j > y2; i -= len_x2, j -= len_y2)
{ {
ctx.moveTo(i, j); ctx.moveTo(i, j);
......
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