Merge pull request #131 from legalthings/Fix_for_min_max_date_options

Fix for min/max date options
legalthings · Mar 18, 2019 · 8eaeb6c · 8eaeb6c
2 parents da82e1f + 77848a4
commit 8eaeb6c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/js/legalform-validation.js b/js/legalform-validation.js
@@ -271,8 +271,8 @@
             if (meta.type === 'date') {
                 var yearly = !!$input.attr('yearly');
                 var date = moment(value, yearly ? 'DD-MM' : 'DD-MM-YYYY', true);
-                var minDate = moment(meta.min_date, 'DD-MM-YYYY', true);
-                var maxDate = moment(meta.max_date, 'DD-MM-YYYY', true);
+                var minDate = moment($input.attr('min_date'), 'DD-MM-YYYY', true);
+                var maxDate = moment($input.attr('max_date'), 'DD-MM-YYYY', true);
                 var valid = date.isValid();
 
                 if (valid && minDate.isValid()) {

diff --git a/js/ractive-legalform.js b/js/ractive-legalform.js
@@ -431,7 +431,19 @@
                 $inputGroup.datetimepicker({
                     locale: ractive.getLocale('short'),
                     format: yearly ? 'DD-MM' : 'DD-MM-YYYY',
-                    dayViewHeaderFormat: yearly ? 'MMMM' : 'MMMM YYYY'
+                    dayViewHeaderFormat: yearly ? 'MMMM' : 'MMMM YYYY',
+
+                    //Allow arrow keys navigation inside date text field
+                    keyBinds: {
+                        up: null,
+                        down: function (widget) {
+                            if (!widget) this.show();
+                        },
+                        left: null,
+                        right: null,
+                        t : null,
+                        delete : null
+                    }
                 });
 
                 $(e.target).closest('.input-group-addon').trigger('click');