Merge branch 'master' into desktop_harry
This commit is contained in:
		
						commit
						8167172ca9
					
				|  | @ -32,13 +32,15 @@ | |||
|                       today = today.format('isoDate'); | ||||
|                       var state = false; | ||||
|                       var arr = state ? "▼" : "▲" | ||||
| 											var start_date = <%= "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'"%> || today | ||||
| 											var end_date = <%= "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'"%> || today | ||||
|                       //calendarRange | ||||
|                       $('#calendarRange .showDate').html(today+" - "+today) | ||||
|                       $('#calendarRange .calendarInput').val(today+" - "+today); | ||||
|                       $('#calendarRange .showDate').html(start_date+" - "+end_date) | ||||
|                       $('#calendarRange .calendarInput').val(start_date+" - "+end_date); | ||||
|                       $('#calendarRange #widgetCalendar').DatePicker({ | ||||
|                           flat: true, | ||||
|                           format: 'Y / m / d', | ||||
|                           date: today, | ||||
| 													date: [start_date,end_date], | ||||
|                           calendars: 1, | ||||
|                           mode: 'range', | ||||
|                           starts: 1, | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue