Skip to content

Commit e37ad9f

Browse files
committed
Merge branch 'release/0.3.13'
2 parents e4d79e9 + e50aaa5 commit e37ad9f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+473
-404
lines changed

.jscsrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"preset": "crockford",
3+
"disallowDanglingUnderscores": { "allExcept": ["_$compile_", "_$rootScope_"] },
4+
"disallowMultipleVarDecl": "strict",
5+
"validateIndentation": 2,
6+
"requireMultipleVarDecl": null
7+
}

README.md

Lines changed: 3 additions & 2 deletions

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-bootstrap-datetimepicker",
3-
"version": "0.3.12",
3+
"version": "0.3.13",
44
"description": "This directive allows you to add a datetime-picker to your form.",
55
"author": "https://github.com/dalelotts/angular-bootstrap-datetimepicker/graphs/contributors",
66
"license": "MIT",

contributing.md

Lines changed: 7 additions & 5 deletions

demo/demo-controller.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
/*globals angular, moment, $, console*/
1+
/*globals angular, moment, $ */
22

33
angular.module('demo.demoController', [])
44
.controller('demoController', [
55
'$scope',
6-
function ($scope) {
6+
'$log',
7+
function ($scope, $log) {
78
'use strict';
89
$scope.controllerName = 'demoController';
910

@@ -32,7 +33,7 @@ angular.module('demo.demoController', [])
3233
// However, can write this function to take any
3334
// action necessary once the user has selected a
3435
// date/time using the picker
35-
console.log(newDate);
36+
$log.info(newDate);
3637
$('#dropdown3').dropdown('toggle');
3738
};
3839

@@ -46,16 +47,16 @@ angular.module('demo.demoController', [])
4647

4748

4849
$scope.guardianOnSetTime = function ($index, guardian, newDate, oldDate) {
49-
console.log($index);
50-
console.log(guardian.name);
51-
console.log(newDate);
52-
console.log(oldDate);
50+
$log.info($index);
51+
$log.info(guardian.name);
52+
$log.info(newDate);
53+
$log.info(oldDate);
5354
angular.element('#guardian' + $index).dropdown('toggle');
5455
};
5556

5657
$scope.beforeRender = function ($dates) {
5758
var index = Math.floor(Math.random() * $dates.length);
58-
console.log(index);
59+
$log.info(index);
5960
$dates[index].selectable = false;
6061
};
6162

4.79 KB
6.37 KB
1.37 KB
1.74 KB
2.46 KB

0 commit comments

Comments
 (0)