Skip to content

Commit 8d93604

Browse files
committed
Update to latest version moment (older versions will fail tests now), also fixed an issue with the css that left some shading in the calendar.
1 parent 68babd6 commit 8d93604

File tree

8 files changed

+32
-31
lines changed

8 files changed

+32
-31
lines changed

Gruntfile.js

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ module.exports = function (grunt) {
1010
grunt.registerTask('default', ['jshint', 'complexity', 'karma', 'coverage']);
1111

1212
var testConfig = function (configFile, customOptions) {
13-
var options = { configFile: configFile, keepalive: true };
13+
var options = {configFile: configFile, keepalive: true};
1414
var travisOptions = process.env.TRAVIS && {
15-
browsers: ['Firefox'],
16-
reporters: ['dots', 'coverage'],
17-
singleRun: true
18-
};
15+
browsers: ['Firefox'],
16+
reporters: ['dots', 'coverage'],
17+
singleRun: true
18+
};
1919
return grunt.util._.extend(options, customOptions, travisOptions);
2020
};
2121

@@ -36,10 +36,10 @@ module.exports = function (grunt) {
3636
src: ['src/**/*.js'],
3737
options: {
3838
breakOnErrors: false,
39-
jsLintXML: 'complexity/report.xml', // create XML JSLint-like report
40-
errorsOnly: false, // show only maintainability errors
41-
cyclomatic: [3, 7, 12], // or optionally a single value, like 3
42-
halstead: [8, 13, 20], // or optionally a single value, like 8
39+
jsLintXML: 'complexity/report.xml', // create XML JSLint-like report
40+
errorsOnly: false, // show only maintainability errors
41+
cyclomatic: [3, 7, 12], // or optionally a single value, like 3
42+
halstead: [8, 13, 20], // or optionally a single value, like 8
4343
maintainability: 100
4444
}
4545
}
@@ -58,13 +58,12 @@ module.exports = function (grunt) {
5858
},
5959
karma: {
6060
unit: {
61-
options: testConfig('karma.conf.js',
62-
{
63-
singleRun: true,
64-
autoWatch: true,
65-
keepalive: true,
66-
browsers: ['Chrome']
67-
})
61+
options: testConfig('karma.conf.js', {
62+
singleRun: true,
63+
autoWatch: true,
64+
keepalive: true,
65+
browsers: ['Chrome']
66+
})
6867
}
6968
},
7069
jshint: {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Angular bootstrap date & time picker version: 0.3.7
1+
# Angular bootstrap date & time picker version: 0.3.8
22
================================
33

44
Native AngularJS datetime picker directive styled by Twitter Bootstrap 3

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-bootstrap-datetimepicker",
3-
"version": "0.3.7",
3+
"version": "0.3.8",
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",
@@ -24,7 +24,7 @@
2424
],
2525
"dependencies": {
2626
"angular": "1.2.26",
27-
"moment": "^2.8.3"
27+
"moment": "^2.8.4"
2828
},
2929
"devDependencies": {
3030
"angular-mocks": "1.2.26",

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-bootstrap-datetimepicker",
3-
"version": "0.3.7",
3+
"version": "0.3.8",
44
"description": "This directive allows you to add a datetime-picker to your form elements.",
55
"author": "https://github.com/dalelotts/ng-bootstrap-datetimepicker/graphs/contributors",
66
"bugs": {
@@ -27,7 +27,8 @@
2727
"karma-chrome-launcher": "^0.1.5",
2828
"karma-coverage": "^0.2.1",
2929
"karma-firefox-launcher": "^0.1.3",
30-
"karma-jasmine": "^0.2.3", "karma-phantomjs-launcher": "^0.1.2",
30+
"karma-jasmine": "^0.3.2",
31+
"karma-phantomjs-launcher": "^0.1.2",
3132
"karma-threshold-reporter": "^0.1.12",
3233
"matchdep": "^0.3.0",
3334
"phantomjs": "^1.9.12"

src/css/datetimepicker.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license angular-bootstrap-datetimepicker version: 0.3.7
2+
* @license angular-bootstrap-datetimepicker version: 0.3.8
33
* (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
44
* License: MIT
55
*/
@@ -144,7 +144,8 @@
144144
border: none;
145145
}
146146
.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td, .datetimepicker .table-striped > tbody > tr:nth-child(odd) > td,
147-
.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td, .datetimepicker .table-striped > tbody > tr:nth-child(odd) > th {
147+
.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td, .datetimepicker .table-striped > tbody > tr:nth-child(odd) > th,
148+
.datetimepicker .table-striped > tbody > tr:nth-child(odd) {
148149
background-color: transparent;
149150
}
150151
.datetimepicker table tr td.minute:hover {

src/js/datetimepicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*jslint vars:true */
33

44
/**
5-
* @license angular-bootstrap-datetimepicker version: 0.3.7
5+
* @license angular-bootstrap-datetimepicker version: 0.3.8
66
* (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
77
* License: MIT
88
*/

test/view/de/hour.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('hour view with initial date of "2020-01-01T00:00:00.000", minView="hou
5757
var selectedElement = jQuery(jQuery('.hour', element)[3]);
5858
selectedElement.trigger('click');
5959

60-
expect(jQuery('.active', element).text()).toBe('03:00 Uhr');
60+
expect(jQuery('.active', element).text()).toBe('03:00');
6161
expect($rootScope.date).toEqual(moment('2020-01-01T03:00:00.000').toDate());
6262
});
6363
});

test/view/de/minute.spec.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
2626
$rootScope.$digest();
2727
}));
2828
it('has `.switch` element with a value of 2013-Jan-22 0:00', function () {
29-
expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 00:00 Uhr');
29+
expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 00:00');
3030
});
3131
it('has 12 `.minute` elements', function () {
3232
expect(jQuery('.minute', element).length).toBe(12);
@@ -35,7 +35,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
3535
expect(jQuery('.active', element).length).toBe(1);
3636
});
3737
it('`.active` element with a value of 0:00', function () {
38-
expect(jQuery('.active', element).text()).toBe('00:00 Uhr');
38+
expect(jQuery('.active', element).text()).toBe('00:00');
3939
});
4040
});
4141

@@ -52,21 +52,21 @@ describe('minute view with initial date of 2013-01-22 1:15', function () {
5252
$rootScope.$digest();
5353
}));
5454
it('has `.switch` element with a value of 22. Jan. 2013 01:00 Uhr', function () {
55-
expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 01:00 Uhr');
55+
expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 01:00');
5656
});
5757
it('has 4 `.minute` elements', function () {
5858
expect(jQuery('.minute', element).length).toBe(4);
5959
});
6060
it('has 1 `.active` element with a value of 1:15', function () {
61-
expect(jQuery('.active', element).text()).toBe('01:15 Uhr');
61+
expect(jQuery('.active', element).text()).toBe('01:15');
6262
});
6363
it('changes date/time to 1:00 to when clicking first `.minute` element with a value of 01:00 Uhr', function () {
64-
expect(jQuery('.active', element).text()).toBe('01:15 Uhr');
64+
expect(jQuery('.active', element).text()).toBe('01:15');
6565

6666
var selectedElement = jQuery(jQuery('.minute', element)[0]);
6767
selectedElement.trigger('click');
6868

69-
expect(jQuery('.active', element).text()).toBe('01:00 Uhr');
69+
expect(jQuery('.active', element).text()).toBe('01:00');
7070
expect($rootScope.date).toEqual(moment('2013-01-22T01:00:00.000').toDate());
7171
});
7272
});

0 commit comments

Comments
 (0)