Skip to content

Commit 282d271

Browse files
committed
Merge pull request fragaria#133 from shanesmith/master
Fix model update not being applied
2 parents 0a31db8 + 71161d2 commit 282d271

4 files changed

+18
-12
lines changed

coffee/angular-daterangepicker.coffee

+4-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ picker.directive 'dateRangePicker', ($compile, $timeout, $parse, dateRangePicker
111111
# disable autoUpdateInput, can't handle empty values without it. Our callback here will
112112
# update our $viewValue, which triggers the $parsers
113113
el.daterangepicker angular.extend(opts, {autoUpdateInput: false}), (start, end) ->
114-
$scope.model = if opts.singleDatePicker then start else {startDate: start, endDate: end}
114+
$scope.$apply () ->
115+
$scope.model = if opts.singleDatePicker then start else {startDate: start, endDate: end}
115116

116117
# Needs to be after daterangerpicker has been created, otherwise
117118
# watchers that reinit will be attached to old daterangepicker instance.
@@ -161,7 +162,8 @@ picker.directive 'dateRangePicker', ($compile, $timeout, $parse, dateRangePicker
161162
_init()
162163
if newClearable
163164
el.on 'cancel.daterangepicker', () ->
164-
$scope.model = if opts.singleDatePicker then null else {startDate: null, endDate: null}
165+
$scope.$apply () ->
166+
$scope.model = if opts.singleDatePicker then null else {startDate: null, endDate: null}
165167

166168
$scope.$on '$destroy', ->
167169
_picker?.remove()

js/angular-daterangepicker.js

+12-8
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,12 @@
131131
el.daterangepicker(angular.extend(opts, {
132132
autoUpdateInput: false
133133
}), function(start, end) {
134-
return $scope.model = opts.singleDatePicker ? start : {
135-
startDate: start,
136-
endDate: end
137-
};
134+
return $scope.$apply(function() {
135+
return $scope.model = opts.singleDatePicker ? start : {
136+
startDate: start,
137+
endDate: end
138+
};
139+
});
138140
});
139141
_picker = el.data('daterangepicker');
140142
results = [];
@@ -185,10 +187,12 @@
185187
_init();
186188
if (newClearable) {
187189
return el.on('cancel.daterangepicker', function() {
188-
return $scope.model = opts.singleDatePicker ? null : {
189-
startDate: null,
190-
endDate: null
191-
};
190+
return $scope.$apply(function() {
191+
return $scope.model = opts.singleDatePicker ? null : {
192+
startDate: null,
193+
endDate: null
194+
};
195+
});
192196
});
193197
}
194198
});

js/angular-daterangepicker.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/angular-daterangepicker.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)