Skip to content

Commit 5743ac2

Browse files
committed
Merge pull request logbon72#33 from drblue/master
Fixed erroneous package.json-file
2 parents 7013b8a + 670caaa commit 5743ac2

File tree

2 files changed

+6
-79
lines changed

2 files changed

+6
-79
lines changed

README.md

Lines changed: 3 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,9 @@
11
# bootstrap-material-datetimepicker
22
Material DateTimePicker
33

4-
Originaly designed for Bootstrap Material, the V2.0 is now completely standalone and responsive.
4+
Created by [T00rk/bootstrap-material-datetimepicker](https://github.com/T00rk/bootstrap-material-datetimepicker), fork by [drblue](https://github.com/drblue/) due to incorrect package.json-file.
55

6-
### Updates
7-
8-
| Date | Author | Description |
9-
| ----------------- | ----------------- | ------------------------------------------------------ |
10-
| 2015-07-01 | T00rk | Redesigned element without using modal |
11-
| 2015-06-16 | T00rk | Use Timepicker alone / Display short time (12 hours) |
12-
| 2015-06-13 | T00rk | Fixed issue with HTML value tag |
13-
| 2015-05-25 | T00rk | Changed repo name to bootstrap-material-datetimepicker * |
14-
| 2015-05-12 | T00rk | Added parameters for button text |
15-
| 2015-05-05 | Sovanna | FIX undefined _minDate in isBeforeMaxDate func |
16-
| 2015-04-10 | T00rk | Little change in clock design |
17-
| 2015-04-10 | Peterzen | Added bower and requirejs support |
18-
| 2015-04-08 | T00rk | Fixed problem on locale switch |
19-
| 2015-03-04 | T00rk | Added Time picker |
20-
(\*) File names have been changed
21-
22-
bootstrap-material-datepicker.js => bootstrap-material-date**time**picker.js
23-
24-
bootstrap-material-datepicker.css => bootstrap-material-date**time**picker.css
25-
26-
### Prerequisites
27-
28-
jquery [http://jquery.com/download/](http://jquery.com/download/)
29-
30-
momentjs [http://momentjs.com/](http://momentjs.com/)
31-
32-
Google Material Icon Font `<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">`
33-
34-
35-
### Live Example
36-
37-
Click [here](http://t00rk.github.io/bootstrap-material-datetimepicker/) to see
38-
39-
### Usage
40-
41-
$('input').bootstrapMaterialDatePicker();
42-
43-
### bower
44-
45-
bower install bootstrap-material-datetimepicker
46-
47-
### Parameters
48-
49-
| Name | Type | Description |
50-
| ----------------- | ----------------------------- | --------------------------------------------- |
51-
| **format** | String | MomentJS Format |
52-
| **shortTime** | Boolean | true => Display 12 hours AM|PM |
53-
| **minDate** | (String\|Date\|Moment) | Minimum selectable date |
54-
| **maxDate** | (String\|Date\|Moment) | Maximum selectable date |
55-
| **currentDate** | (String\|Date\|Moment) | Initial Date |
56-
| **date** | Boolean | true => Has Datepicker |
57-
| **time** | Boolean | true => Has Timepicker |
58-
| **cancelText** | String | Text for the cancel button (default: Cancel) |
59-
| **okText** | String | Text for the OK button (default: OK) |
60-
61-
62-
### Events
63-
64-
| Name | Parameters | Description |
65-
| ----------------- | ------------------------- | ------------------------------------------------- |
66-
| **beforeChange** | event, date | OK button is clicked |
67-
| **change** | event, date | OK button is clicked and input value is changed |
68-
| **dateSelected** | event, date | New date is selected |
69-
70-
71-
### Methods
72-
73-
$('input').bootstrapMaterialDatePicker('setDate', moment());
74-
75-
| Name | Parameter | Description |
76-
| ----------------- | ------------------------- | ----------------------------- |
77-
| **setDate** | (String\|Date\|Moment) | Set initial date |
78-
| **setMinDate** | (String\|Date\|Moment) | Set minimum selectable date |
79-
| **setMaxDate** | (String\|Date\|Moment) | Set maximum selectable date |
80-
| **destroy** | NULL | Destroy the datepicker |
6+
### Install
817

8+
npm install drblue/bootstrap-material-datetimepicker --save
829

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"front-end",
1111
"web"
1212
],
13-
"homepage": "https://github.com/t00rk/bootstrap-material-datetimepicker",
13+
"homepage": "https://github.com/drblue/bootstrap-material-datetimepicker",
1414
"main": [
1515
"js/bootstrap-material-datetimepicker.js",
1616
"css/bootstrap-material-datetimepicker.css"
@@ -26,13 +26,13 @@
2626
"test-infra"
2727
],
2828
"dependencies": {
29-
"momentjs": "~2.10.2",
29+
"moment": "~2.10.2",
3030
"bootstrap": "~3.3.4",
3131
"jquery": "1.11.0",
3232
"bootstrap-material-design": "~0.3.0"
3333
},
3434
"repository": {
3535
"type": "git",
36-
"url": "https://github.com/t00rk/bootstrap-material-datetimepicker"
36+
"url": "https://github.com/drblue/bootstrap-material-datetimepicker"
3737
}
3838
}

0 commit comments

Comments
 (0)