diff options
| -rw-r--r-- | tests/unit/datepicker/methods.js | 11 | ||||
| -rw-r--r-- | ui/widgets/datepicker.js | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/unit/datepicker/methods.js b/tests/unit/datepicker/methods.js index 32d611748..ec83fb791 100644 --- a/tests/unit/datepicker/methods.js +++ b/tests/unit/datepicker/methods.js @@ -11,7 +11,7 @@ var beforeAfterEach = testHelper.beforeAfterEach; QUnit.module( "datepicker: methods", beforeAfterEach() ); QUnit.test( "destroy", function( assert ) { - assert.expect( 35 ); + assert.expect( 39 ); var inl, inp = testHelper.init( "#inp" ), dp = $( "#ui-datepicker-div" ); @@ -21,6 +21,15 @@ QUnit.test( "destroy", function( assert ) { assert.equal( dp.css( "display" ), "block", "Datepicker - visible" ); inp.datepicker( "hide" ).datepicker( "destroy" ); assert.ok( $.datepicker._curInst == null, "Datepicker - destroyed and cleared reference" ); + assert.equal( dp.css( "display" ), "none", "Datepicker - absent" ); + + // Destroy without manual hiding (ensure datepicker is hidden after calling destroy) + inp = testHelper.init( "#inp" ); + inp.datepicker( "show" ); + assert.equal( dp.css( "display" ), "block", "Datepicker - visible" ); + inp.datepicker( "destroy" ); + assert.ok( $.datepicker._curInst == null, "Datepicker - destroyed and cleared reference" ); + assert.equal( dp.css( "display" ), "none", "Datepicker - absent" ); inp = testHelper.init( "#inp" ); assert.ok( inp.is( ".hasDatepicker" ), "Default - marker class set" ); diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js index 605760572..323723b89 100644 --- a/ui/widgets/datepicker.js +++ b/ui/widgets/datepicker.js @@ -435,6 +435,7 @@ $.extend( Datepicker.prototype, { $target.removeClass( this.markerClassName ).empty(); } + $.datepicker._hideDatepicker(); if ( datepicker_instActive === inst ) { datepicker_instActive = null; this._curInst = null; |