diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html index a8fdf91ca..81fbd8986 100644 --- a/tests/unit/draggable/draggable.html +++ b/tests/unit/draggable/draggable.html @@ -101,7 +101,6 @@
Relative
Absolute
-
Absolute right-bottom
Absolute
diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js index 8b3895163..bce3f4e23 100644 --- a/tests/unit/draggable/draggable_core.js +++ b/tests/unit/draggable/draggable_core.js @@ -25,13 +25,6 @@ test( "element types", function() { el.append("content"); } - // intrinsic height is incorrect in FF for buttons with no content - // https://bugzilla.mozilla.org/show_bug.cgi?id=471763 - // Support: FF - if ( typeName === "button" ) { - el.text( "button" ); - } - el.draggable({ cancel: "" }); offsetBefore = el.offset(); el.simulate( "drag", { @@ -42,8 +35,8 @@ test( "element types", function() { // Support: FF, Chrome, and IE9, // there are some rounding errors in so we can't say equal, we have to settle for close enough - closeEnough( offsetBefore.left, offsetAfter.left - 50, 1, "dragged[50, 50] " + "<" + typeName + "> left" ); - closeEnough( offsetBefore.top, offsetAfter.top - 50, 1, "dragged[50, 50] " + "<" + typeName + "> top" ); + closeEnough( offsetBefore.left, offsetAfter.left - 50, 1, "dragged[50, 50] " + "<" + typeName + ">" ); + closeEnough( offsetBefore.top, offsetAfter.top - 50, 1, "dragged[50, 50] " + "<" + typeName + ">" ); el.draggable("destroy"); el.remove(); }); @@ -348,29 +341,4 @@ test( "ui-draggable-handle managed correctly in nested draggables", function( as assert.hasClasses( child, "ui-draggable-handle", "child retains class name on destroy" ); }); -// http://bugs.jqueryui.com/ticket/7772 -// when css 'right' is set, element resizes on drag -test( "setting right/bottom css shouldn't cause resize", function() { - expect( 4 ); - - var finalOffset, - element = $( "#draggable3" ), - origWidth = element.width(), - origHeight = element.height(), - origOffset = element.offset(); - - element.draggable(); - - TestHelpers.draggable.move( element, -50, -50 ); - - finalOffset = element.offset(); - finalOffset.left += 50; - finalOffset.top += 50; - - closeEnough( element.width(), origWidth, 1, "element retains width" ); - closeEnough( element.height(), origHeight, 1, "element retains height" ); - closeEnough( finalOffset.top, origOffset.top, "element moves the correct vertical distance" ); - closeEnough( finalOffset.top, origOffset.top, "element moves the correct horizontal distance" ); -}); - })( jQuery ); diff --git a/ui/draggable.js b/ui/draggable.js index 2aced90c3..d938be1e8 100644 --- a/ui/draggable.js +++ b/ui/draggable.js @@ -213,10 +213,6 @@ $.widget("ui.draggable", $.ui.mouse, { $.ui.ddmanager.prepareOffsets(this, event); } - // Reset helper's right/bottom css if they're set and set explicit width/height instead - // as this prevents resizing of elements with right/bottom set (see #7772) - this._normalizeRightBottom(); - this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position //If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003) @@ -659,17 +655,6 @@ $.widget("ui.draggable", $.ui.mouse, { } }, - _normalizeRightBottom: function() { - if ( this.options.axis !== "y" && this.helper.css( "right" ) !== "auto" ) { - this.helper.width( this.helper.width() ); - this.helper.css( "right", "auto" ); - } - if ( this.options.axis !== "x" && this.helper.css( "bottom" ) !== "auto" ) { - this.helper.height( this.helper.height() ); - this.helper.css( "bottom", "auto" ); - } - }, - // From now on bulk stuff - mainly helpers _trigger: function( type, event, ui ) {