aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.sortable.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-10-21 20:33:49 +0200
committerFelix Nagel <info@felixnagel.com>2013-10-21 20:33:49 +0200
commitfab6b8883e9464d101e2550dd2c12706a9de164d (patch)
tree5b19fadfa678d5709dfb9451b7635f00f038369f /ui/jquery.ui.sortable.js
parent7af3dab075b71b4a4b542e3e3201229399a56959 (diff)
parentfdc7052fdb7fdac34e79203a0cea2376fa588994 (diff)
downloadjquery-ui-fab6b8883e9464d101e2550dd2c12706a9de164d.tar.gz
jquery-ui-fab6b8883e9464d101e2550dd2c12706a9de164d.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.sortable.js')
-rw-r--r--ui/jquery.ui.sortable.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 9c7bf446c..c76a02397 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -354,12 +354,12 @@ $.widget("ui.sortable", $.ui.mouse, {
}
// Only put the placeholder inside the current Container, skip all
- // items form other containers. This works because when moving
+ // items from other containers. This works because when moving
// an item from one container to another the
// currentContainer is switched before the placeholder is moved.
//
- // Without this moving items in "sub-sortables" can cause the placeholder to jitter
- // beetween the outer and inner container.
+ // Without this, moving items in "sub-sortables" can cause
+ // the placeholder to jitter beetween the outer and inner container.
if (item.instance !== this.currentContainer) {
continue;
}