Skip to content

Commit 11afe4b

Browse files
author
Sandro Tajè
committed
timepicker fix
1 parent b15cf52 commit 11afe4b

File tree

4 files changed

+38
-35
lines changed

4 files changed

+38
-35
lines changed

‎angular-datepicker.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,13 @@ angular.module("angular-datepicker", []).directive("datepicker", ['$timeout', 'p
281281
};
282282

283283
$scope.close = function (date) {
284-
console.log(date);
285284
$scope.opened = false;
286285
if($scope.timepicker){
287286
date.setHours($scope.selectedTime.hour);
288287
date.setMinutes($scope.selectedTime.minute);
289288
date.setSeconds($scope.selectedTime.second);
290289
}
291-
ngModel.$setViewValue($filter("date")(date, $scope.dateFormat));
290+
ngModel.$setViewValue($filter("date")(date, "yyyy-MM-ddTHH:mm:ssZ"));
292291
ngModel.$render();
293292
$timeout(function () {
294293
$scope.events.onDaySelected && $scope.events.onDaySelected();

‎debug.log

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[0203/093629:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004
2+
[0203/093629:ERROR:node_debugger.cc(86)] Cannot start debugger server

‎example/index.html

+34-32
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,51 @@
11
<html ng-app="example">
22

33
<head>
4-
<link rel="stylesheet" href="./../angular-datepicker.css" </head>
4+
<link rel="stylesheet" href="./../angular-datepicker.css">
5+
</head>
56

6-
<body ng-controller="ExampleController">
7+
<body ng-controller="ExampleController">
78

8-
<button type="text" data-datepicker ng-model="day" data-options="options" data-events="events" ng-change="onChange(d)"></button>
9-
{{day}}
9+
<button type="text" data-datepicker ng-model="day" data-options="options" data-events="events" ng-change="onChange(d)"></button>
10+
{{day}}
1011

11-
<button ng-click="clear()">Clear</button>
12+
<button ng-click="clear()">Clear</button>
1213

13-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js"></script>
14-
<script src="./../angular-datepicker.js"></script>
15-
<script>
14+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js"></script>
15+
<script src="./../angular-datepicker.js"></script>
16+
<script>
1617

17-
angular.module('example', ['angular-datepicker']).controller('ExampleController', function ($scope, $timeout) {
18+
angular.module('example', ['angular-datepicker']).controller('ExampleController', function ($scope, $timeout) {
1819

19-
$scope.day = 1451606400000;
20-
$scope.options = {
21-
monthNames: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
22-
dayNames: ['Lunedi', 'Martedi', 'Mercoledi', 'Giovedi', 'Venerdi', 'Sabato', 'Domenica'],
23-
cleanName: 'Pulisci',
24-
selectName: 'Seleziona',
25-
dateFormat: "yyyy-MM-dd",
26-
emptyString: "Open datepicker"
27-
}
20+
$scope.day = 1451606400000;
21+
$scope.options = {
22+
monthNames: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
23+
dayNames: ['Lunedi', 'Martedi', 'Mercoledi', 'Giovedi', 'Venerdi', 'Sabato', 'Domenica'],
24+
cleanName: 'Pulisci',
25+
selectName: 'Seleziona',
26+
dateFormat: "yyyy-MM-dd HH:mm:ss",
27+
emptyString: "Open datepicker",
28+
timepicker: true
29+
}
2830

29-
$scope.events = {
30-
onDaySelected: onDaySelected
31-
}
31+
$scope.events = {
32+
onDaySelected: onDaySelected
33+
}
3234

33-
$scope.clear = function() {
34-
$scope.day = null;
35-
}
35+
$scope.clear = function () {
36+
$scope.day = null;
37+
}
3638

37-
$scope.onChange = function(d) {
38-
console.log($scope.day);
39-
}
39+
$scope.onChange = function (d) {
40+
console.log($scope.day);
41+
}
4042

41-
function onDaySelected() {
42-
// console.log($scope.day);
43-
}
44-
});
43+
function onDaySelected() {
44+
// console.log($scope.day);
45+
}
46+
});
4547

46-
</script>
48+
</script>
4749
</body>
4850

4951

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-datepicker",
3-
"version": "2.0.5",
3+
"version": "2.0.6",
44
"description": "angular responsive datepicker",
55
"main": "angular-datepicker.js",
66
"directories": {

0 commit comments

Comments
 (0)