|
@@ 16503-16523 (lines=21) @@
|
| 16500 |
|
} |
| 16501 |
|
} |
| 16502 |
|
|
| 16503 |
|
if ( o.grid ) { |
| 16504 |
|
top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) / |
| 16505 |
|
o.grid[ 1 ] ) * o.grid[ 1 ]; |
| 16506 |
|
pageY = this.containment ? |
| 16507 |
|
( ( top - this.offset.click.top >= this.containment[ 1 ] && |
| 16508 |
|
top - this.offset.click.top <= this.containment[ 3 ] ) ? |
| 16509 |
|
top : |
| 16510 |
|
( ( top - this.offset.click.top >= this.containment[ 1 ] ) ? |
| 16511 |
|
top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : |
| 16512 |
|
top; |
| 16513 |
|
|
| 16514 |
|
left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) / |
| 16515 |
|
o.grid[ 0 ] ) * o.grid[ 0 ]; |
| 16516 |
|
pageX = this.containment ? |
| 16517 |
|
( ( left - this.offset.click.left >= this.containment[ 0 ] && |
| 16518 |
|
left - this.offset.click.left <= this.containment[ 2 ] ) ? |
| 16519 |
|
left : |
| 16520 |
|
( ( left - this.offset.click.left >= this.containment[ 0 ] ) ? |
| 16521 |
|
left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : |
| 16522 |
|
left; |
| 16523 |
|
} |
| 16524 |
|
|
| 16525 |
|
} |
| 16526 |
|
|
|
@@ 10171-10191 (lines=21) @@
|
| 10168 |
|
} |
| 10169 |
|
} |
| 10170 |
|
|
| 10171 |
|
if ( o.grid ) { |
| 10172 |
|
|
| 10173 |
|
//Check for grid elements set to 0 to prevent divide by 0 error causing invalid |
| 10174 |
|
// argument errors in IE (see ticket #6950) |
| 10175 |
|
top = o.grid[ 1 ] ? this.originalPageY + Math.round( ( pageY - |
| 10176 |
|
this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ] : this.originalPageY; |
| 10177 |
|
pageY = containment ? ( ( top - this.offset.click.top >= containment[ 1 ] || |
| 10178 |
|
top - this.offset.click.top > containment[ 3 ] ) ? |
| 10179 |
|
top : |
| 10180 |
|
( ( top - this.offset.click.top >= containment[ 1 ] ) ? |
| 10181 |
|
top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top; |
| 10182 |
|
|
| 10183 |
|
left = o.grid[ 0 ] ? this.originalPageX + |
| 10184 |
|
Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ] : |
| 10185 |
|
this.originalPageX; |
| 10186 |
|
pageX = containment ? ( ( left - this.offset.click.left >= containment[ 0 ] || |
| 10187 |
|
left - this.offset.click.left > containment[ 2 ] ) ? |
| 10188 |
|
left : |
| 10189 |
|
( ( left - this.offset.click.left >= containment[ 0 ] ) ? |
| 10190 |
|
left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left; |
| 10191 |
|
} |
| 10192 |
|
|
| 10193 |
|
if ( o.axis === "y" ) { |
| 10194 |
|
pageX = this.originalPageX; |