diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2015-03-10 15:40:49 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2015-03-11 08:42:12 -0400 |
| commit | 1f9821c000adbf2ebeccacf9506a7df68956574b (patch) | |
| tree | 3a1e70fe0303262bab6130377038e52a9f2edce1 | |
| parent | a6a18d1ed82ca68cf1a8551be706ea8b03841242 (diff) | |
| download | jquery-ui-1f9821c000adbf2ebeccacf9506a7df68956574b.tar.gz jquery-ui-1f9821c000adbf2ebeccacf9506a7df68956574b.zip | |
Dialog: Remove animation stopping in destroy
Effects wrappers are no longer used, so the workaround and test are no
longer necessary.
This fixes tests in IE8 with jQuery 1.7.
Effectively a complete revert of 13505e5945e5532c3d56424d50ad109c665d205f
Closes gh-1481
| -rw-r--r-- | tests/unit/dialog/dialog.html | 1 | ||||
| -rw-r--r-- | tests/unit/dialog/dialog_options.js | 9 | ||||
| -rw-r--r-- | ui/dialog.js | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index 6f39f7b8a..55da8c8f5 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -22,7 +22,6 @@ "ui/button.js", "ui/effect.js", "ui/effect-blind.js", - "ui/effect-clip.js", "ui/effect-explode.js", "ui/dialog.js" ] diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index 3e5444c67..6bab426fb 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.js @@ -283,15 +283,6 @@ test("height", function() { element.remove(); }); -asyncTest( "hide, #5860 - don't leave effects wrapper behind", function() { - expect( 1 ); - $( "#dialog1" ).dialog({ hide: "clip" }).dialog( "close" ).dialog( "destroy" ); - setTimeout(function() { - equal( $( ".ui-effects-wrapper" ).length, 0 ); - start(); - }, 500); -}); - test("maxHeight", function() { expect(3); diff --git a/ui/dialog.js b/ui/dialog.js index 0775fbe8d..166f68b0f 100644 --- a/ui/dialog.js +++ b/ui/dialog.js @@ -168,7 +168,7 @@ return $.widget( "ui.dialog", { // Without detaching first, the following becomes really slow .detach(); - this.uiDialog.stop( true, true ).remove(); + this.uiDialog.remove(); if ( this.originalTitle ) { this.element.attr( "title", this.originalTitle ); |