Merge branch 'release/0.3.8'

Author: dalelotts

Gruntfile.js

@@ -10,12 +10,12 @@ module.exports = function (grunt) {
   grunt.registerTask('default', ['jshint', 'complexity', 'karma', 'coverage']);
 
   var testConfig = function (configFile, customOptions) {
-    var options = { configFile: configFile, keepalive: true };
+    var options = {configFile: configFile, keepalive: true};
     var travisOptions = process.env.TRAVIS && {
-      browsers: ['Firefox'],
-      reporters: ['dots', 'coverage'],
-      singleRun: true
-    };
+        browsers: ['Firefox'],
+        reporters: ['dots', 'coverage'],
+        singleRun: true
+      };
     return grunt.util._.extend(options, customOptions, travisOptions);
   };
 
@@ -36,10 +36,10 @@ module.exports = function (grunt) {
         src: ['src/**/*.js'],
         options: {
           breakOnErrors: false,
-          jsLintXML: 'complexity/report.xml',         // create XML JSLint-like report
-          errorsOnly: false,               // show only maintainability errors
-          cyclomatic: [3, 7, 12],          // or optionally a single value, like 3
-          halstead: [8, 13, 20],           // or optionally a single value, like 8
+          jsLintXML: 'complexity/report.xml',   // create XML JSLint-like report
+          errorsOnly: false,                    // show only maintainability errors
+          cyclomatic: [3, 7, 12],               // or optionally a single value, like 3
+          halstead: [8, 13, 20],                // or optionally a single value, like 8
           maintainability: 100
         }
       }
@@ -58,13 +58,12 @@ module.exports = function (grunt) {
     },
     karma: {
       unit: {
-        options: testConfig('karma.conf.js',
-          {
-            singleRun: true,
-            autoWatch: true,
-            keepalive: true,
-            browsers: ['Chrome']
-          })
+        options: testConfig('karma.conf.js', {
+          singleRun: true,
+          autoWatch: true,
+          keepalive: true,
+          browsers: ['Chrome']
+        })
       }
     },
     jshint: {

README.md

@@ -1,4 +1,4 @@
-# Angular bootstrap date & time picker version: 0.3.7
+# Angular bootstrap date & time picker version: 0.3.8
 ================================
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "This directive allows you to add a datetime-picker to your form.",
   "author": "https://github.com/dalelotts/angular-bootstrap-datetimepicker/graphs/contributors",
   "license": "MIT",
@@ -14,15 +14,17 @@
     "bower_components",
     "demo*",
     "Gruntfile.js",
+    "gulpfile.js",
     "karma.conf.js",
     "node_modules",
     "package.json",
+    "paths.js",
     "screenshots",
     "test*"
   ],
   "dependencies": {
     "angular": "1.2.26",
-    "moment": "^2.8.3"
+    "moment": "^2.8.4"
   },
   "devDependencies": {
     "angular-mocks": "1.2.26",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "This directive allows you to add a datetime-picker to your form elements.",
   "author": "https://github.com/dalelotts/ng-bootstrap-datetimepicker/graphs/contributors",
   "bugs": {
@@ -27,7 +27,8 @@
     "karma-chrome-launcher": "^0.1.5",
     "karma-coverage": "^0.2.1",
     "karma-firefox-launcher": "^0.1.3",
-    "karma-jasmine": "^0.2.3",                            "karma-phantomjs-launcher": "^0.1.2",
+    "karma-jasmine": "^0.3.2",
+    "karma-phantomjs-launcher": "^0.1.2",
     "karma-threshold-reporter": "^0.1.12",
     "matchdep": "^0.3.0",
     "phantomjs": "^1.9.12"

src/css/datetimepicker.css

@@ -1,5 +1,5 @@
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.7
+ * @license angular-bootstrap-datetimepicker  version: 0.3.8
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
@@ -144,7 +144,8 @@
     border: none;
 }
 .datetimepicker .table-striped > tbody > tr:nth-child(odd) > td, .datetimepicker .table-striped > tbody > tr:nth-child(odd) > td,
-.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td, .datetimepicker .table-striped > tbody > tr:nth-child(odd) > th {
+.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td, .datetimepicker .table-striped > tbody > tr:nth-child(odd) > th,
+.datetimepicker .table-striped > tbody > tr:nth-child(odd) {
   background-color: transparent;
 }
 .datetimepicker table tr td.minute:hover {

src/js/datetimepicker.js

@@ -2,7 +2,7 @@
 /*jslint vars:true */
 
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.7
+ * @license angular-bootstrap-datetimepicker  version: 0.3.8
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */

test/view/de/hour.spec.js

@@ -57,7 +57,7 @@ describe('hour view with initial date of "2020-01-01T00:00:00.000", minView="hou
     var selectedElement = jQuery(jQuery('.hour', element)[3]);
     selectedElement.trigger('click');
 
-    expect(jQuery('.active', element).text()).toBe('03:00 Uhr');
+    expect(jQuery('.active', element).text()).toBe('03:00');
     expect($rootScope.date).toEqual(moment('2020-01-01T03:00:00.000').toDate());
   });
 });

test/view/de/minute.spec.js

@@ -26,7 +26,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
     $rootScope.$digest();
   }));
   it('has `.switch` element with a value of 2013-Jan-22 0:00', function () {
-    expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 00:00 Uhr');
+    expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 00:00');
   });
   it('has 12 `.minute` elements', function () {
     expect(jQuery('.minute', element).length).toBe(12);
@@ -35,7 +35,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
     expect(jQuery('.active', element).length).toBe(1);
   });
   it('`.active` element with a value of 0:00', function () {
-    expect(jQuery('.active', element).text()).toBe('00:00 Uhr');
+    expect(jQuery('.active', element).text()).toBe('00:00');
   });
 });
 
@@ -52,21 +52,21 @@ describe('minute view with initial date of 2013-01-22 1:15', function () {
     $rootScope.$digest();
   }));
   it('has `.switch` element with a value of 22. Jan. 2013 01:00 Uhr', function () {
-    expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 01:00 Uhr');
+    expect(jQuery('.switch', element).text()).toBe('22. Jan. 2013 01:00');
   });
   it('has 4 `.minute` elements', function () {
     expect(jQuery('.minute', element).length).toBe(4);
   });
   it('has 1 `.active` element with a value of 1:15', function () {
-    expect(jQuery('.active', element).text()).toBe('01:15 Uhr');
+    expect(jQuery('.active', element).text()).toBe('01:15');
   });
   it('changes date/time to 1:00 to when clicking first `.minute` element with a value of 01:00 Uhr', function () {
-    expect(jQuery('.active', element).text()).toBe('01:15 Uhr');
+    expect(jQuery('.active', element).text()).toBe('01:15');
 
     var selectedElement = jQuery(jQuery('.minute', element)[0]);
     selectedElement.trigger('click');
 
-    expect(jQuery('.active', element).text()).toBe('01:00 Uhr');
+    expect(jQuery('.active', element).text()).toBe('01:00');
     expect($rootScope.date).toEqual(moment('2013-01-22T01:00:00.000').toDate());
   });
 });