diff --git a/tests/unit/datepicker/methods.js b/tests/unit/datepicker/methods.js index 4fc0c84ec..8729c5606 100644 --- a/tests/unit/datepicker/methods.js +++ b/tests/unit/datepicker/methods.js @@ -8,9 +8,18 @@ define( [ QUnit.module( "datepicker: methods" ); QUnit.test( "destroy", function( assert ) { - assert.expect( 33 ); + assert.expect( 35 ); var inl, - inp = testHelper.init( "#inp" ); + inp = testHelper.init( "#inp" ), + dp = $( "#ui-datepicker-div" ); + + // Destroy and clear active reference + inp.datepicker( "show" ); + assert.equal( dp.css( "display" ), "block", "Datepicker - visible" ); + inp.datepicker( "hide" ).datepicker( "destroy" ); + assert.ok( $.datepicker._curInst == null, "Datepicker - destroyed and cleared reference" ); + + inp = testHelper.init( "#inp" ); assert.ok( inp.is( ".hasDatepicker" ), "Default - marker class set" ); assert.ok( $.data( inp[ 0 ], testHelper.PROP_NAME ), "Default - instance present" ); assert.ok( inp.next().is( "#alt" ), "Default - button absent" ); diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js index 5e6321e1d..441170c97 100644 --- a/ui/widgets/datepicker.js +++ b/ui/widgets/datepicker.js @@ -408,6 +408,7 @@ $.extend( Datepicker.prototype, { if ( datepicker_instActive === inst ) { datepicker_instActive = null; + this._curInst = null; } },