Draggable: Ensure css is always restored after connectToSortable drag

Fixes #9675

diff --git a/ui/draggable.js b/ui/draggable.js
index d290ea539b82466c70960e6bb29ffc2b0662cfb4..ba8eca42b3568ed3b2370d8b3a14b0c003de0eaf 100644 (file)
--- a/ui/draggable.js
+++ b/ui/draggable.js
@@ -744,19 +744,20 @@ $.ui.plugin.add("draggable", "connectToSortable", {
                                if (this.shouldRevert) {
                                        this.instance.options.revert = this.shouldRevert;
                                }
+                               // Use _storedCSS To restore properties in the sortable,
+                               // as this also handles revert (#9675) since the draggable
+                               // may have modified them in unexpected ways (#8809)
+                               this.instance._storedCSS = {
+                                       position: this.instance.placeholder.css( "position" ),
+                                       top: this.instance.placeholder.css( "top" ),
+                                       left: this.instance.placeholder.css( "left" )
+                               };
 
                                //Trigger the stop of the sortable
                                this.instance._mouseStop(event);
 
                                this.instance.options.helper = this.instance.options._helper;
 
-                               // restore properties in the sortable, since the draggable may have
-                               // modified them in unexpected ways (#8809)
-                               this.instance.currentItem.css({
-                                       position: this.instance.placeholder.css( "position" ),
-                                       top: "",
-                                       left: ""
-                               });
                        } else {
                                // Prevent this Sortable from removing the helper.
                                // However, don't set the draggable to remove the helper