Merge branch 'release/0.3.2'

Author: dalelotts

README.md

@@ -1,4 +1,4 @@
-# Angular bootstrap date & time picker  v0.3.1
+# Angular bootstrap date & time picker  v0.3.2
 ================================
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "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",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "This directive allows you to add a datetime-picker to your form elements.",
   "author": "https://github.com/dalelotts/ng-bootstrap-datetimepicker/graphs/contributors",
   "license": "MIT",

src/css/datetimepicker.css

@@ -1,6 +1,6 @@
 /**
- * @license angular-bootstrap-datetimepicker  v0.3.1
- * (c) 2013 Knight Rider Consulting, Inc. http://www.knightrider.com
+ * @license angular-bootstrap-datetimepicker  v0.3.2
+ * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
 

src/js/datetimepicker.js

@@ -2,8 +2,8 @@
 /*jslint vars:true */
 
 /**
- * @license angular-bootstrap-datetimepicker  v0.3.1
- * (c) 2013 Knight Rider Consulting, Inc. http://www.knightrider.com
+ * @license angular-bootstrap-datetimepicker  v0.3.2
+ * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
 
@@ -301,13 +301,14 @@ angular.module('ui.bootstrap.datetimepicker', [])
             var tempDate = new Date(unixDate);
             var newDate = new Date(tempDate.getTime() + (tempDate.getTimezoneOffset() * 60000));
 
+            var oldDate = scope.ngModel;
             scope.ngModel = newDate;
 
             if (configuration.dropdownSelector) {
               jQuery(configuration.dropdownSelector).dropdown('toggle');
             }
 
-            scope.onSetTime({ newDate: newDate, oldDate: scope.ngModel });
+            scope.onSetTime({ newDate: scope.ngModel, oldDate: oldDate });
 
             return dataFactory[configuration.startView](unixDate);
           }

test/configuration/onSetTime.spec.js

@@ -58,5 +58,24 @@ describe('onSetTime', function () {
       selectedElement.trigger('click');
     });
   });
+
+
+  describe('accepts additional parameter for onSetTime', function () {
+    it('if onSetTime is not a function', function () {
+
+      $rootScope.setTimeFunction = function (index, oldDate, newDate) {
+        expect(oldDate).toBe(null);
+        expect(oldDate).not.toEqual(newDate);
+        expect(newDate).toEqual(moment("2020-01-01T00:00:00.000").toDate());
+        console.log(index);
+      };
+
+      var element = $compile('<datetimepicker data-ng-model=\'date\' data-on-set-time=\'setTimeFunction(3, oldDate, newDate, "foo")\' data-datetimepicker-config="{ startView: \'year\', minView: \'year\' }" ></datetimepicker>')($rootScope);
+      $rootScope.$digest();
+
+      var selectedElement = jQuery('.future', element);
+      selectedElement.trigger('click');
+    });
+  });
 });