Merge c7e9f4a into d7717b4

dpgmediamagazines · Jan 11, 2019 · e273d68 · e273d68
2 parents d7717b4 + c7e9f4a
commit e273d68
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/arctic/static/arctic/src/assets/js/components/widgets.js b/arctic/static/arctic/src/assets/js/components/widgets.js
@@ -31,7 +31,7 @@ function django2datepicker(django_format) {
 }
 
 function datetimeformatter(django_date, format) {
-    var date_valid = moment(django_date).isValid();
+    var date_valid = moment(django_date, format).isValid();
     if (!date_valid) {
         return null;
     } else {
@@ -127,7 +127,7 @@ $(document).ready(function() {
     $.fn.datepicker.language['en'] = datetime_picker_settings;
 
     $('[js-datepicker]').each(function(index) {
-        var date = datetimeformatter($(this).attr("data-date"), datetime_picker_settings.dateFormat);
+        var date = datetimeformatter($(this).attr("data-date"), $(this).attr('format') ? $(this).attr('format') : datetime_picker_settings.dateFormat);
         var instance = this;
         $(instance).attr('type', 'text');
         $(instance).datepicker({
@@ -151,7 +151,7 @@ $(document).ready(function() {
     });
 
     $('[js-timepicker]').each(function(index) {
-        var date = datetimeformatter($(this).attr("data-time"), datetime_picker_settings.timeFormat);
+        var date = datetimeformatter($(this).attr("data-date"), $(this).attr('format') ? $(this).attr('format') : datetime_picker_settings.timeFormat);
         var instance = this;
         $(instance).attr('type', 'text');
         $(instance).datepicker({
@@ -175,7 +175,7 @@ $(document).ready(function() {
     });
 
     $('[js-datetimepicker]').each(function(index) {
-        var date = datetimeformatter($(this).attr("data-datetime"), `${datetime_picker_settings.dateFormat} ${datetime_picker_settings.timeFormat}`);
+        var date = datetimeformatter($(this).attr("data-datetime"),  $(this).attr('format') ? $(this).attr('format') : `${datetime_picker_settings.dateFormat} ${datetime_picker_settings.timeFormat}`);
         var instance = this;
         $(instance).attr('type', 'text');
         $(instance).datepicker({