From 73ef71088c3feb92802e39ffc690538272b86259 Mon Sep 17 00:00:00 2001 From: Foxandxss Date: Thu, 25 Feb 2016 14:41:07 +0100 Subject: [PATCH] fix(datepicker): assign initDate correctly to the controller --- src/datepicker/datepicker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js index 15fe53a448..f89093bf2a 100644 --- a/src/datepicker/datepicker.js +++ b/src/datepicker/datepicker.js @@ -130,7 +130,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst break; case 'initDate': if ($scope.datepickerOptions.initDate) { - this.activeDate = dateParser.fromTimezone($scope.datepickerOptions.initDate, ngModelOptions.timezone) || new Date(); + self.activeDate = dateParser.fromTimezone($scope.datepickerOptions.initDate, ngModelOptions.timezone) || new Date(); $scope.$watch(function() { return $scope.datepickerOptions.initDate; }, function(initDate) { if (initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)) { self.activeDate = dateParser.fromTimezone(initDate, ngModelOptions.timezone); @@ -138,7 +138,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst } }); } else { - this.activeDate = new Date(); + self.activeDate = new Date(); } } });