Merge branch 'release/0.3.9'

Author: dalelotts

.travis.yml

@@ -1,17 +1,22 @@
 language: node_js
 node_js:
-  - "0.10"
-
+- '0.12'
 branches:
   except:
-    - gh-pages
-
+  - gh-pages
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 before_script:
-  - npm install -g bower grunt-cli
-  - bower install
-
-script: "grunt --verbose"
+- npm install -g bower grunt-cli
+- bower install
+script: grunt --verbose
+deploy:
+  provider: npm
+  email: dale@dalelotts.com
+  api_key:
+    secure: uS3oRid+vZK5nKVqd5YNhAJGyNbJAdw0/3gHZB67ynG9HWEr1Y026uzf0Ext6XT9LHjCgGPEaN1Lyjr+LJRYt+LV7HYDVm09RrEIqJm+2+2qwQIpVtxRyr6xCr1b2EFFrYqwZPe33/Y0WradbaqQ0EKLBSygCNL8tzC7b1yxD6U=
+  on:
+    tags: true
+    repo: dalelotts/angular-bootstrap-datetimepicker
+    branch: master

README.md

@@ -1,4 +1,4 @@
-# Angular bootstrap date & time picker version: 0.3.8
+# Angular bootstrap date & time picker version: 0.3.10
 ================================
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3
@@ -127,7 +127,8 @@ The following parameters are supplied by this directive :
 
 ```
 DateObject {
-    dateValue: Number - UTC time value of this date object - same as moment.valueOf() or Date.getTime(). It does NOT contain time zone information so take that into account when comparing to other dates.
+    utcDateValue: Number - UTC time value of this date object. It does NOT contain time zone information so take that into account when comparing to other dates (or use localDateValue function).
+    localDateValue: FUNCTION that returns a Number - local time value of this date object - same as moment.valueOf() or Date.getTime().
     display: String - the way this value will be displayed on the calendar.
     active: true | false | undefined - indicates that date object is part of the model value.
     selectable: true | false | undefined - indicates that date value is selectable by the user.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "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",
@@ -23,12 +23,12 @@
     "test*"
   ],
   "dependencies": {
-    "angular": "1.2.26",
+    "angular": "~1.3.14",
     "moment": "^2.8.4"
   },
   "devDependencies": {
-    "angular-mocks": "1.2.26",
-    "bootstrap": "^3.1.1",
-    "jquery": "^2.1.1"
+    "angular-mocks": "~1.3.14",
+    "bootstrap": "^3.3.1",
+    "jquery": "^2.1.3"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "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": {
@@ -18,7 +18,7 @@
     "grunt-contrib-jshint": "^0.10.0",
     "grunt-istanbul-coverage": "^0.1.0",
     "grunt-karma": "^0.9.0",
-    "gulp": "^3.8.10",
+    "gulp": "^3.8.11",
     "gulp-bump": "^0.1.11",
     "gulp-jshint": "^1.9.0",
     "gulp-plato": "^1.0.1",

src/css/datetimepicker.css

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

src/js/datetimepicker.js

@@ -2,7 +2,7 @@
 /*jslint vars:true */
 
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.8
+ * @license angular-bootstrap-datetimepicker  version: 0.3.10
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
@@ -16,7 +16,7 @@
 (function (factory) {
   'use strict';
   /* istanbul ignore if */
-  if (typeof define === 'function'  && /* istanbul ignore next */ define.amd) {
+  if (typeof define === 'function' && /* istanbul ignore next */ define.amd) {
     define(['angular', 'moment'], factory); // AMD
   } else {
     factory(window.angular, window.moment); // Browser global
@@ -34,10 +34,16 @@
 
       function DateObject() {
 
-        this.dateValue = new Date().getTime();
+        var tempDate = new Date();
+        var localOffset = tempDate.getTimezoneOffset() * 60000;
+        this.utcDateValue = tempDate.getTime();
         this.selectable = true;
 
-        var validProperties = ['dateValue', 'display', 'active', 'selectable', 'past', 'future'];
+        this.localDateValue = function () {
+          return this.utcDateValue + localOffset;
+        };
+
+        var validProperties = ['utcDateValue', 'localDateValue', 'display', 'active', 'selectable', 'past', 'future'];
 
         for (var prop in arguments[0]) {
           /* istanbul ignore else */
@@ -97,7 +103,7 @@
         restrict: 'E',
         require: 'ngModel',
         template: '<div class="datetimepicker table-responsive">' +
-        '<table class="table table-striped">' +
+        '<table class="table table-striped  {{ data.currentView }}-view">' +
         '   <thead>' +
         '       <tr>' +
         '           <th class="left" data-ng-click="changeView(data.currentView, data.leftDate, $event)" data-ng-show="data.leftDate.selectable"><i class="glyphicon glyphicon-arrow-left"/></th>' +
@@ -163,16 +169,16 @@
               var result = {
                 'currentView': 'year',
                 'nextView': configuration.minView === 'year' ? 'setTime' : 'month',
-                'previousViewDate': new DateObject({dateValue: null, display: startDecade + '-' + (startDecade + 9)}),
-                'leftDate': new DateObject({dateValue: moment.utc(startDate).subtract(9, 'year').valueOf()}),
-                'rightDate': new DateObject({dateValue: moment.utc(startDate).add(11, 'year').valueOf()}),
+                'previousViewDate': new DateObject({utcDateValue: null, display: startDecade + '-' + (startDecade + 9)}),
+                'leftDate': new DateObject({utcDateValue: moment.utc(startDate).subtract(9, 'year').valueOf()}),
+                'rightDate': new DateObject({utcDateValue: moment.utc(startDate).add(11, 'year').valueOf()}),
                 'dates': []
               };
 
               for (var i = 0; i < 12; i += 1) {
                 var yearMoment = moment.utc(startDate).add(i, 'years');
                 var dateValue = {
-                  'dateValue': yearMoment.valueOf(),
+                  'utcDateValue': yearMoment.valueOf(),
                   'display': yearMoment.format('YYYY'),
                   'past': yearMoment.year() < startDecade,
                   'future': yearMoment.year() > startDecade + 9,
@@ -196,18 +202,18 @@
                 'currentView': 'month',
                 'nextView': configuration.minView === 'month' ? 'setTime' : 'day',
                 'previousViewDate': new DateObject({
-                  dateValue: previousViewDate.valueOf(),
+                  utcDateValue: previousViewDate.valueOf(),
                   display: startDate.format('YYYY')
                 }),
-                'leftDate': new DateObject({dateValue: moment.utc(startDate).subtract(1, 'year').valueOf()}),
-                'rightDate': new DateObject({dateValue: moment.utc(startDate).add(1, 'year').valueOf()}),
+                'leftDate': new DateObject({utcDateValue: moment.utc(startDate).subtract(1, 'year').valueOf()}),
+                'rightDate': new DateObject({utcDateValue: moment.utc(startDate).add(1, 'year').valueOf()}),
                 'dates': []
               };
 
               for (var i = 0; i < 12; i += 1) {
                 var monthMoment = moment.utc(startDate).add(i, 'months');
                 var dateValue = {
-                  'dateValue': monthMoment.valueOf(),
+                  'utcDateValue': monthMoment.valueOf(),
                   'display': monthMoment.format('MMM'),
                   'active': monthMoment.format('YYYY-MMM') === activeDate
                 };
@@ -234,11 +240,11 @@
                 'currentView': 'day',
                 'nextView': configuration.minView === 'day' ? 'setTime' : 'hour',
                 'previousViewDate': new DateObject({
-                  dateValue: previousViewDate.valueOf(),
+                  utcDateValue: previousViewDate.valueOf(),
                   display: startOfMonth.format('YYYY-MMM')
                 }),
-                'leftDate': new DateObject({dateValue: moment.utc(startOfMonth).subtract(1, 'months').valueOf()}),
-                'rightDate': new DateObject({dateValue: moment.utc(startOfMonth).add(1, 'months').valueOf()}),
+                'leftDate': new DateObject({utcDateValue: moment.utc(startOfMonth).subtract(1, 'months').valueOf()}),
+                'rightDate': new DateObject({utcDateValue: moment.utc(startOfMonth).add(1, 'months').valueOf()}),
                 'dayNames': [],
                 'weeks': []
               };
@@ -253,7 +259,7 @@
                 for (var j = 0; j < 7; j += 1) {
                   var monthMoment = moment.utc(startDate).add((i * 7) + j, 'days');
                   var dateValue = {
-                    'dateValue': monthMoment.valueOf(),
+                    'utcDateValue': monthMoment.valueOf(),
                     'display': monthMoment.format('D'),
                     'active': monthMoment.format('YYYY-MMM-DD') === activeDate,
                     'past': monthMoment.isBefore(startOfMonth),
@@ -278,18 +284,18 @@
                 'currentView': 'hour',
                 'nextView': configuration.minView === 'hour' ? 'setTime' : 'minute',
                 'previousViewDate': new DateObject({
-                  dateValue: previousViewDate.valueOf(),
+                  utcDateValue: previousViewDate.valueOf(),
                   display: selectedDate.format('ll')
                 }),
-                'leftDate': new DateObject({dateValue: moment.utc(selectedDate).subtract(1, 'days').valueOf()}),
-                'rightDate': new DateObject({dateValue: moment.utc(selectedDate).add(1, 'days').valueOf()}),
+                'leftDate': new DateObject({utcDateValue: moment.utc(selectedDate).subtract(1, 'days').valueOf()}),
+                'rightDate': new DateObject({utcDateValue: moment.utc(selectedDate).add(1, 'days').valueOf()}),
                 'dates': []
               };
 
               for (var i = 0; i < 24; i += 1) {
                 var hourMoment = moment.utc(selectedDate).add(i, 'hours');
                 var dateValue = {
-                  'dateValue': hourMoment.valueOf(),
+                  'utcDateValue': hourMoment.valueOf(),
                   'display': hourMoment.format('LT'),
                   'active': hourMoment.format('YYYY-MM-DD H') === activeFormat
                 };
@@ -310,11 +316,11 @@
                 'currentView': 'minute',
                 'nextView': 'setTime',
                 'previousViewDate': new DateObject({
-                  dateValue: previousViewDate.valueOf(),
+                  utcDateValue: previousViewDate.valueOf(),
                   display: selectedDate.format('lll')
                 }),
-                'leftDate': new DateObject({dateValue: moment.utc(selectedDate).subtract(1, 'hours').valueOf()}),
-                'rightDate': new DateObject({dateValue: moment.utc(selectedDate).add(1, 'hours').valueOf()}),
+                'leftDate': new DateObject({utcDateValue: moment.utc(selectedDate).subtract(1, 'hours').valueOf()}),
+                'rightDate': new DateObject({utcDateValue: moment.utc(selectedDate).add(1, 'hours').valueOf()}),
                 'dates': []
               };
 
@@ -323,7 +329,7 @@
               for (var i = 0; i < limit; i += 1) {
                 var hourMoment = moment.utc(selectedDate).add(i * configuration.minuteStep, 'minute');
                 var dateValue = {
-                  'dateValue': hourMoment.valueOf(),
+                  'utcDateValue': hourMoment.valueOf(),
                   'display': hourMoment.format('LT'),
                   'active': hourMoment.format('YYYY-MM-DD H:mm') === activeFormat
                 };
@@ -362,8 +368,8 @@
               event.preventDefault();
             }
 
-            if (viewName && (dateObject.dateValue > -Infinity) && dateObject.selectable && dataFactory[viewName]) {
-              var result = dataFactory[viewName](dateObject.dateValue);
+            if (viewName && (dateObject.utcDateValue > -Infinity) && dateObject.selectable && dataFactory[viewName]) {
+              var result = dataFactory[viewName](dateObject.utcDateValue);
 
               var weekDates = [];
               if (result.weeks) {
@@ -389,7 +395,7 @@
           };
 
           ngModelController.$render = function $render() {
-            scope.changeView(configuration.startView, new DateObject({dateValue: getUTCTime(ngModelController.$viewValue)}));
+            scope.changeView(configuration.startView, new DateObject({utcDateValue: getUTCTime(ngModelController.$viewValue)}));
           };
         }
       };

test/configuration/beforeRender.spec.js

@@ -81,8 +81,10 @@ describe('beforeRender', function () {
 
       $rootScope.beforeRender = function (dates) {
         expect(dates.length).toBe(42);
-        expect(dates[0].dateValue).toBe(1388275200000);
-        expect(dates[11].dateValue).toBe(1389225600000);
+        expect(dates[0].utcDateValue).toBe(1388275200000);
+        expect(dates[0].localDateValue()).toBe(1388293200000);
+        expect(dates[11].utcDateValue).toBe(1389225600000);
+        expect(dates[11].localDateValue()).toBe(1389243600000);
       };
 
       spyOn($rootScope, 'beforeRender').and.callThrough();
@@ -158,7 +160,7 @@ describe('beforeRender', function () {
       selectedElement.trigger('click');
 
       expect($rootScope.beforeRender).toHaveBeenCalled();
-      expect($rootScope.beforeRender.calls.argsFor(0)[0].dateValue).toEqual(631152000000); // 1990-01-01
+      expect($rootScope.beforeRender.calls.argsFor(0)[0].utcDateValue).toEqual(631152000000); // 1990-01-01
     });
 
 
@@ -178,7 +180,7 @@ describe('beforeRender', function () {
       selectedElement.trigger('click');
 
       expect($rootScope.beforeRender).toHaveBeenCalled();
-      expect($rootScope.beforeRender.calls.argsFor(0)[0].dateValue).toEqual(1420070400000); // 2015-01-01
+      expect($rootScope.beforeRender.calls.argsFor(0)[0].utcDateValue).toEqual(1420070400000); // 2015-01-01
     });
 
 
@@ -199,7 +201,7 @@ describe('beforeRender', function () {
 
       expect($rootScope.beforeRender).toHaveBeenCalled();
 
-      expect($rootScope.beforeRender.calls.argsFor(0)[0].dateValue).toEqual(1388534400000); // 2014-01-01 - the start of the 'month' view.
+      expect($rootScope.beforeRender.calls.argsFor(0)[0].utcDateValue).toEqual(1388534400000); // 2014-01-01 - the start of the 'month' view.
 
 
       var selectedElement = jQuery(jQuery('.day', element)[2]);
@@ -227,7 +229,7 @@ describe('beforeRender', function () {
       $rootScope.$digest();
 
       expect($scope.beforeRender).toHaveBeenCalled();
-      expect($scope.beforeRender.calls.argsFor(0)[0].dateValue).toEqual(1412121600000); // 2014-10-01 12:00 the start of the 'day' view
+      expect($scope.beforeRender.calls.argsFor(0)[0].utcDateValue).toEqual(1412121600000); // 2014-10-01 12:00 the start of the 'day' view
 
       var selectedElement = jQuery(jQuery('.hour', element)[2]);
       selectedElement.trigger('click');
@@ -249,7 +251,7 @@ describe('beforeRender', function () {
       $rootScope.$digest();
 
       expect($rootScope.beforeRender).toHaveBeenCalled();
-      expect($rootScope.beforeRender.calls.argsFor(0)[0].dateValue).toEqual(1413590400000);   // 2014-10-18 00:00 Z
+      expect($rootScope.beforeRender.calls.argsFor(0)[0].utcDateValue).toEqual(1413590400000);   // 2014-10-18 00:00 Z
 
 
       var selectedElement = jQuery(jQuery('.minute', element)[2]);

test/model/ngModelController.spec.js

@@ -33,12 +33,14 @@ describe('ngModelController', function () {
 
       spyOn($rootScope, 'setTimeFunction');
 
-      var element = $compile('<form name="pickerform"><datetimepicker data-ng-model="data.dateValue" name="dateValue" data-on-set-time="setTimeFunction(newDate)" required data-datetimepicker-config="{ startView: \'day\', minView: \'day\' }" ></datetimepicker></form>')($rootScope);
+      var formElement = $compile('<form name="pickerform"><datetimepicker data-ng-model="data.dateValue" name="dateValue" data-on-set-time="setTimeFunction(newDate)" required data-datetimepicker-config="{ startView: \'day\', minView: \'day\' }" ></datetimepicker></form>')($rootScope);
       $rootScope.$digest();
 
-      var picker = jQuery(jQuery('.datetimepicker', element));
+      var picker = jQuery(jQuery('.datetimepicker', formElement));
 
-      expect(picker.hasClass('ng-pristine')).toBeTruthy(); // This will break in 1.3, not sure why.
+      expect(formElement.hasClass('ng-pristine')).toBeTruthy();
+
+      // expect(picker.hasClass('ng-pristine')).toBeTruthy(); // This breaks in 1.3, not sure why.
       expect(picker.hasClass('ng-invalid')).toBeTruthy();
       expect(picker.hasClass('ng-dirty')).toBeFalsy();
       expect(picker.hasClass('ng-valid')).toBeFalsy();
@@ -53,6 +55,8 @@ describe('ngModelController', function () {
       expect(picker.hasClass('ng-dirty')).toBeTruthy();
       expect(picker.hasClass('ng-valid')).toBeTruthy();
 
+      expect(formElement.hasClass('ng-pristine')).toBeFalsy();
+      expect(formElement.hasClass('ng-dirty')).toBeTruthy();
     });
   });
 

test/view/de/day.spec.js

@@ -12,6 +12,25 @@
  *    @since        7/21/13
  */
 
+describe('current view displayed on the markup', function(){
+  'use strict';
+
+  var $rootScope, element;
+
+  beforeEach(module('ui.bootstrap.datetimepicker'));
+  beforeEach(inject(function (_$compile_, _$rootScope_) {
+    moment.locale('de');
+    $rootScope = _$rootScope_;
+    $rootScope.date = moment('2013-01-22T00:00:00.000').toDate();
+    element = _$compile_('<datetimepicker data-datetimepicker-config="{ startView: \'day\'}" data-ng-model="date"></datetimepicker>')($rootScope);
+    $rootScope.$digest();
+  }));
+
+  it('should have `.day-view` class', function () {
+    expect(jQuery('table', element).hasClass('day-view')).toBeTruthy();
+  });
+});
+
 describe('German day view with initial date of 2013-01-22', function () {
   'use strict';
   var $rootScope, element;