File tree Expand file tree Collapse file tree 2 files changed +15
-7
lines changed Expand file tree Collapse file tree 2 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -44,18 +44,19 @@ QUnit.test( "beforeOpen", function( assert ) {
44
44
} ) ;
45
45
46
46
QUnit . test ( "change" , function ( assert ) {
47
- assert . expect ( 4 ) ;
47
+ assert . expect ( 6 ) ;
48
48
49
49
var shouldFire ;
50
50
51
51
this . element . datepicker ( {
52
- change : function ( event ) {
52
+ change : function ( event , ui ) {
53
53
assert . ok ( shouldFire , "change event fired" ) ;
54
54
assert . equal (
55
55
event . type ,
56
56
"datepickerchange" ,
57
57
"change event"
58
58
) ;
59
+ assert . equal ( $ . type ( ui . value ) , "date" , "value is a date object" ) ;
59
60
}
60
61
} ) ;
61
62
@@ -121,19 +122,20 @@ QUnit.test( "open", function( assert ) {
121
122
122
123
QUnit . test ( "select" , function ( assert ) {
123
124
var ready = assert . async ( ) ;
124
- assert . expect ( 4 ) ;
125
+ assert . expect ( 6 ) ;
125
126
126
127
var message = "" ,
127
128
that = this ;
128
129
129
130
this . element . datepicker ( {
130
- select : function ( event ) {
131
+ select : function ( event , ui ) {
131
132
assert . ok ( true , "select event fired " + message ) ;
132
133
assert . equal (
133
134
event . originalEvent . type ,
134
135
"calendarselect" ,
135
136
"select originalEvent " + message
136
137
) ;
138
+ assert . equal ( $ . type ( ui . value ) , "date" , "value is a date object" ) ;
137
139
}
138
140
} ) ;
139
141
Original file line number Diff line number Diff line change @@ -111,14 +111,18 @@ var widget = $.widget( "ui.datepicker", {
111
111
. calendar ( $ . extend ( { } , this . options , {
112
112
value : this . _parse ( this . element . val ( ) ) ,
113
113
change : function ( event ) {
114
- that . _trigger ( "change" , event ) ;
114
+ that . _trigger ( "change" , event , {
115
+ value : that . calendarInstance . valueAsDate ( )
116
+ } ) ;
115
117
} ,
116
118
select : function ( event ) {
117
119
that . element . val ( that . calendarInstance . value ( ) ) ;
118
120
that . close ( ) ;
119
121
event . preventDefault ( ) ;
120
122
that . _focusTrigger ( ) ;
121
- that . _trigger ( "select" , event ) ;
123
+ that . _trigger ( "select" , event , {
124
+ value : that . calendarInstance . valueAsDate ( )
125
+ } ) ;
122
126
123
127
return false ;
124
128
}
@@ -183,7 +187,9 @@ var widget = $.widget( "ui.datepicker", {
183
187
this . suppressExpandOnFocus = false ;
184
188
} ,
185
189
change : function ( event ) {
186
- this . _trigger ( "change" , event ) ;
190
+ this . _trigger ( "change" , event , {
191
+ value : this . calendarInstance . valueAsDate ( )
192
+ } ) ;
187
193
}
188
194
} ,
189
195
You can’t perform that action at this time.
0 commit comments