Skip to content

Commit f8724ed

Browse files
committed
#9 auto-ok except minutes view
1 parent 3e466f1 commit f8724ed

File tree

6 files changed

+23
-20
lines changed

6 files changed

+23
-20
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ bower install ng-material-datetimepicker
5151

5252
## CDN
5353
```
54-
<script src="https://unpkg.com/ng-material-datetimepicker@1.6.1/dist/angular-material-datetimepicker.min.js"></script>
55-
<script src="https://unpkg.com/ng-material-datetimepicker@1.6.1/dist/angular-material-datetimepicker.min.js.map"></script>
56-
<link href="https://unpkg.com/ng-material-datetimepicker@1.6.1/dist/material-datetimepicker.min.css rel="stylesheet" type="text/css">
54+
<script src="https://unpkg.com/ng-material-datetimepicker@1.6.2/dist/angular-material-datetimepicker.min.js"></script>
55+
<script src="https://unpkg.com/ng-material-datetimepicker@1.6.2/dist/angular-material-datetimepicker.min.js.map"></script>
56+
<link href="https://unpkg.com/ng-material-datetimepicker@1.6.2/dist/material-datetimepicker.min.css rel="stylesheet" type="text/css">
5757
```
5858
or
5959
```
60-
<script src="https://cdn.rawgit.com/beenote/angular-material-datetimepicker/v1.6.1/dist/angular-material-datetimepicker.min.js"></script>
61-
<script src="https://cdn.rawgit.com/beenote/angular-material-datetimepicker/v1.6.1/dist/angular-material-datetimepicker.min.js.map"></script>
62-
<link href="https://cdn.rawgit.com/beenote/angular-material-datetimepicker/v1.6.1/dist/material-datetimepicker.min.css" rel="stylesheet" type="text/css">
60+
<script src="https://cdn.rawgit.com/beenote/angular-material-datetimepicker/v1.6.2/dist/angular-material-datetimepicker.min.js"></script>
61+
<script src="https://cdn.rawgit.com/beenote/angular-material-datetimepicker/v1.6.2/dist/angular-material-datetimepicker.min.js.map"></script>
62+
<link href="https://cdn.rawgit.com/beenote/angular-material-datetimepicker/v1.6.2/dist/material-datetimepicker.min.css" rel="stylesheet" type="text/css">
6363
```
6464

6565
## Live Example

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ng-material-datetimepicker",
33
"description": "A datetime picker for AngularJS Material",
4-
"version": "1.6.1",
4+
"version": "1.6.2",
55
"keywords": [
66
"css",
77
"js",

dist/angular-material-datetimepicker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-material-datetimepicker.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/angular-material-datetimepicker.js

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,26 +1007,29 @@
10071007
});
10081008

10091009
scope.setTime = function (val) {
1010-
// double click
1011-
if (val === scope.currentValue && !picker.params.autoOk) {
1012-
picker.ok();
1013-
}
1014-
10151010
if (!minuteMode) {
1011+
// double click
1012+
if (val === scope.currentValue && !picker.params.autoOk){
1013+
picker.ok();
1014+
}
1015+
10161016
if (picker.params.shortTime) {
10171017
picker.currentDate.hour(picker.isPM() ? (val + 12) : val);
10181018
} else {
10191019
picker.currentDate.hour(val);
10201020
}
1021-
1021+
// single click
1022+
if (picker.params.autoOk) {
1023+
picker.ok();
1024+
}
10221025
} else {
1026+
// double click
1027+
if (val === scope.currentValue){
1028+
picker.ok();
1029+
}
10231030
picker.currentDate.minute(val);
10241031
}
10251032
picker.currentDate.second(0);
1026-
// single click
1027-
if (picker.params.autoOk) {
1028-
picker.ok();
1029-
}
10301033
};
10311034

10321035
scope.pointAvailable = function (point) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ng-material-datetimepicker",
33
"description": "A datetime picker for AngularJS Material",
4-
"version": "1.6.1",
4+
"version": "1.6.2",
55
"keywords": [
66
"css",
77
"js",

0 commit comments

Comments
 (0)