Merge pull request #3790 from camptocamp/f_3419

Fix the minDate and maxDate initialization in the datepicker option object
camptocamp · Apr 23, 2018 · bafa6f8 · bafa6f8
2 parents 77bc95d + 6540b2f
commit bafa6f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/directives/datepicker.js b/src/directives/datepicker.js
@@ -46,6 +46,8 @@ ngeo.DatePicker = function(ngeoDatePickerTemplateUrl,  $timeout) {
       $['datepicker']['setDefaults']($['datepicker']['regional'][lang]);
 
       ctrl.sdateOptions = angular.extend({}, ctrl.sdateOptions, {
+        'minDate': ctrl.initialMinDate,
+        'maxDate': ctrl.initialMaxDate,
         'onClose': function(selectedDate) {
           if (selectedDate) {
             $(element[0]).find('input[name="edate"]').datepicker('option', 'minDate', selectedDate);
@@ -54,6 +56,8 @@ ngeo.DatePicker = function(ngeoDatePickerTemplateUrl,  $timeout) {
       });
 
       ctrl.edateOptions = angular.extend({}, ctrl.edateOptions, {
+        'minDate': ctrl.initialMinDate,
+        'maxDate': ctrl.initialMaxDate,
         'onClose': function(selectedDate) {
           if (selectedDate) {
             $(element[0]).find('input[name="sdate"]').datepicker('option', 'maxDate', selectedDate);
@@ -149,8 +153,6 @@ ngeo.DatePickerController = function($scope, $injector, ngeoTime, gettextCatalog
    * @export
    */
   this.edateOptions = {
-    'minDate': this.initialMinDate,
-    'maxDate': this.initialMaxDate,
     'changeMonth': true,
     'changeYear': true
   };
@@ -161,8 +163,6 @@ ngeo.DatePickerController = function($scope, $injector, ngeoTime, gettextCatalog
    * @export
    */
   this.sdateOptions = {
-    'minDate': this.initialMinDate,
-    'maxDate': this.initialMaxDate,
     'changeMonth': true,
     'changeYear': true
   };

diff --git a/src/directives/partials/datepicker.html b/src/directives/partials/datepicker.html
@@ -3,7 +3,7 @@
     <div ng-if="::datepickerCtrl.time.widget === 'datepicker'">
       <div class="ngeo-datepicker-start-date">
         <span ng-if="::datepickerCtrl.time.mode === 'range'" translate>From:</span>
-        <span ng-if="::datepickerCtrl.time.mode !== 'range'"translate>Date:</span>
+        <span ng-if="::datepickerCtrl.time.mode !== 'range'" translate>Date:</span>
         <input name="sdate" ui-date="datepickerCtrl.sdateOptions" ng-model="datepickerCtrl.sdate" required=""/>
       </div>
       <div