Skip to content

Commit 3409418

Browse files
porterclevJasonKimy
andcommitted
Datepicker: hides on destroy
Co-authored-by: DawnSovereign <jason.t.kim2@gmail.com>
1 parent 5e4f1b8 commit 3409418

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

tests/unit/datepicker/methods.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var beforeAfterEach = testHelper.beforeAfterEach;
1111
QUnit.module( "datepicker: methods", beforeAfterEach() );
1212

1313
QUnit.test( "destroy", function( assert ) {
14-
assert.expect( 35 );
14+
assert.expect( 39 );
1515
var inl,
1616
inp = testHelper.init( "#inp" ),
1717
dp = $( "#ui-datepicker-div" );
@@ -21,6 +21,15 @@ QUnit.test( "destroy", function( assert ) {
2121
assert.equal( dp.css( "display" ), "block", "Datepicker - visible" );
2222
inp.datepicker( "hide" ).datepicker( "destroy" );
2323
assert.ok( $.datepicker._curInst == null, "Datepicker - destroyed and cleared reference" );
24+
assert.equal( dp.css( "display" ), "none", "Datepicker - absent" );
25+
26+
// Destroy Without Hiding
27+
inp = testHelper.init( "#inp" );
28+
inp.datepicker( "show" );
29+
assert.equal( dp.css( "display" ), "block", "Datepicker - visible" );
30+
inp.datepicker( "destroy" );
31+
assert.ok( $.datepicker._curInst == null, "Datepicker - destroyed and cleared reference" );
32+
assert.equal( dp.css( "display" ), "none", "Datepicker - absent" );
2433

2534
inp = testHelper.init( "#inp" );
2635
assert.ok( inp.is( ".hasDatepicker" ), "Default - marker class set" );

ui/widgets/datepicker.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,12 +434,10 @@ $.extend( Datepicker.prototype, {
434434
} else if ( nodeName === "div" || nodeName === "span" ) {
435435
$target.removeClass( this.markerClassName ).empty();
436436
}
437-
438-
inst.dpDiv.remove();
437+
$.datepicker._hideDatepicker();
439438
if ( datepicker_instActive === inst ) {
440439
datepicker_instActive = null;
441440
this._curInst = null;
442-
this.dpDiv = null;
443441
}
444442
},
445443

0 commit comments

Comments
 (0)