diff options
| author | kborchers <k_borchers@yahoo.com> | 2011-05-13 10:23:44 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-13 15:18:25 -0400 |
| commit | 16b4ffb791f50d8852289db88eef175b6d1adb97 (patch) | |
| tree | 1163441671ec13413d50026217c8060667f56b26 | |
| parent | 3842fa9f948283fa4bab9a99ad8d0a8a2adcc175 (diff) | |
| download | jquery-ui-16b4ffb791f50d8852289db88eef175b6d1adb97.tar.gz jquery-ui-16b4ffb791f50d8852289db88eef175b6d1adb97.zip | |
Draggable: Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE. Fixed #6950 - ie 8 invalid drag and drop error
(cherry picked from commit d136e4333e117b33aa16eb9a3a5831a25b1a2dd9)
| -rw-r--r-- | ui/jquery.ui.draggable.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js index 26468b489..3d007869e 100644 --- a/ui/jquery.ui.draggable.js +++ b/ui/jquery.ui.draggable.js @@ -436,10 +436,11 @@ $.widget("ui.draggable", $.ui.mouse, { } if(o.grid) { - var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1]; + //Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950) + var top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY; pageY = containment ? (!(top - this.offset.click.top < containment[1] || top - this.offset.click.top > containment[3]) ? top : (!(top - this.offset.click.top < containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top; - var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0]; + var left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX; pageX = containment ? (!(left - this.offset.click.left < containment[0] || left - this.offset.click.left > containment[2]) ? left : (!(left - this.offset.click.left < containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left; } |