@@ 5610-5630 (lines=21) @@ | ||
5607 | } |
|
5608 | } |
|
5609 | ||
5610 | if ( o.grid ) { |
|
5611 | top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) / |
|
5612 | o.grid[ 1 ] ) * o.grid[ 1 ]; |
|
5613 | pageY = this.containment ? |
|
5614 | ( ( top - this.offset.click.top >= this.containment[ 1 ] && |
|
5615 | top - this.offset.click.top <= this.containment[ 3 ] ) ? |
|
5616 | top : |
|
5617 | ( ( top - this.offset.click.top >= this.containment[ 1 ] ) ? |
|
5618 | top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : |
|
5619 | top; |
|
5620 | ||
5621 | left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) / |
|
5622 | o.grid[ 0 ] ) * o.grid[ 0 ]; |
|
5623 | pageX = this.containment ? |
|
5624 | ( ( left - this.offset.click.left >= this.containment[ 0 ] && |
|
5625 | left - this.offset.click.left <= this.containment[ 2 ] ) ? |
|
5626 | left : |
|
5627 | ( ( left - this.offset.click.left >= this.containment[ 0 ] ) ? |
|
5628 | left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : |
|
5629 | left; |
|
5630 | } |
|
5631 | ||
5632 | } |
|
5633 | ||
@@ 1759-1779 (lines=21) @@ | ||
1756 | } |
|
1757 | } |
|
1758 | ||
1759 | if ( o.grid ) { |
|
1760 | ||
1761 | //Check for grid elements set to 0 to prevent divide by 0 error causing invalid |
|
1762 | // argument errors in IE (see ticket #6950) |
|
1763 | top = o.grid[ 1 ] ? this.originalPageY + Math.round( ( pageY - |
|
1764 | this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ] : this.originalPageY; |
|
1765 | pageY = containment ? ( ( top - this.offset.click.top >= containment[ 1 ] || |
|
1766 | top - this.offset.click.top > containment[ 3 ] ) ? |
|
1767 | top : |
|
1768 | ( ( top - this.offset.click.top >= containment[ 1 ] ) ? |
|
1769 | top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top; |
|
1770 | ||
1771 | left = o.grid[ 0 ] ? this.originalPageX + |
|
1772 | Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ] : |
|
1773 | this.originalPageX; |
|
1774 | pageX = containment ? ( ( left - this.offset.click.left >= containment[ 0 ] || |
|
1775 | left - this.offset.click.left > containment[ 2 ] ) ? |
|
1776 | left : |
|
1777 | ( ( left - this.offset.click.left >= containment[ 0 ] ) ? |
|
1778 | left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left; |
|
1779 | } |
|
1780 | ||
1781 | if ( o.axis === "y" ) { |
|
1782 | pageX = this.originalPageX; |