Merge branch 'release/0.3.11'

Author: dalelotts

README.md

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

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "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.10",
+  "version": "0.3.11",
   "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": {

src/css/datetimepicker.css

@@ -1,5 +1,5 @@
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.10
+ * @license angular-bootstrap-datetimepicker  version: 0.3.11
  * (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.10
+ * @license angular-bootstrap-datetimepicker  version: 0.3.11
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */

test/configuration/beforeRender.spec.js

@@ -79,12 +79,14 @@ describe('beforeRender', function () {
 
       $rootScope.date = moment('2014-01-01T00:00:00.000').toDate();
 
+      var offset = new Date().getTimezoneOffset() * 60000;
+
       $rootScope.beforeRender = function (dates) {
         expect(dates.length).toBe(42);
         expect(dates[0].utcDateValue).toBe(1388275200000);
-        expect(dates[0].localDateValue()).toBe(1388293200000);
+        expect(dates[0].localDateValue()).toBe(1388275200000 + offset);
         expect(dates[11].utcDateValue).toBe(1389225600000);
-        expect(dates[11].localDateValue()).toBe(1389243600000);
+        expect(dates[11].localDateValue()).toBe(1389225600000 + offset);
       };
 
       spyOn($rootScope, 'beforeRender').and.callThrough();