Skip to content

Commit d3622a4

Browse files
committed
Merge latest master into todayBtn
2 parents e7f22bb + 4805a1b commit d3622a4

24 files changed

+603
-311
lines changed

README.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Home
22

3-
http://www.eyecon.ro/bootstrap-datepicker/
3+
This is a fork of Stefan Petre's [original code](http://www.eyecon.ro/bootstrap-datepicker/);
4+
thanks go to him for getting this thing started!
5+
6+
Please note that this fork is not used on Stefan's page at this time, nor is it maintained or
7+
contributed to by him (yet?)
48

59
# Example
610

@@ -104,7 +108,7 @@ All options that take a "Date" can handle a `Date` object; a String formatted ac
104108

105109
String. Default: 'mm/dd/yyyy'
106110

107-
The date format, combination of d, dd, m, mm, M, MM, yy, yyy.
111+
The date format, combination of d, dd, m, mm, M, MM, yy, yyyy.
108112

109113
### weekStart
110114

@@ -142,6 +146,12 @@ Boolean. Default: false
142146

143147
If true, display a button at the bottom of the datepicker to select the current date.
144148

149+
### keyboardNavigation
150+
151+
Boolean. Default: true
152+
153+
Whether or not to allow date navigation by arrow keys.
154+
145155
### language
146156

147157
String. Default: 'en'
@@ -241,6 +251,14 @@ Fired when the date is changed.
241251
}
242252
});
243253

254+
### changeYear
255+
256+
Fired when the *view* year is changed from decade view.
257+
258+
### changeMonth
259+
260+
Fired when the *view* month is changed from year view.
261+
244262
## Keyboard support
245263

246264
The datepicker includes some keyboard navigation:

css/datepicker.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
display: block;
5555
}
5656
.datepicker table {
57-
width: 100%;
5857
margin: 0;
5958
}
6059
.datepicker td,
@@ -133,11 +132,11 @@
133132
}
134133
.datepicker td span {
135134
display: block;
136-
width: 47px;
135+
width: 23%;
137136
height: 54px;
138137
line-height: 54px;
139138
float: left;
140-
margin: 2px;
139+
margin: 1%;
141140
cursor: pointer;
142141
-webkit-border-radius: 4px;
143142
-moz-border-radius: 4px;

0 commit comments

Comments
 (0)