CiviEvent Dashboard and Manage Events: clean up disused url template vars

[civicrm-core.git] / js / crm.datepicker.js

diff --git a/js/crm.datepicker.js b/js/crm.datepicker.js
index cf0719f78d11b2a1c71bdb25549627f2c0e55bea..e1a15f85d0afb6b57cc1c4109f2d730bc325275e 100644 (file)
--- a/js/crm.datepicker.js
+++ b/js/crm.datepicker.js
@@ -24,6 +24,7 @@
         $dateField = $(),
         $timeField = $(),
         $clearLink = $(),
+        placeholder,
         hasDatepicker = settings.date !== false && settings.date !== 'yy',
         type = hasDatepicker ? 'text' : 'number';
 
@@ -33,21 +34,27 @@
       }
       if (settings.time !== false) {
         $timeField = $('<input>').insertAfter($dataField);
+        placeholder = settings.timePlaceholder || $dataField.attr('time-placeholder');
         CRM.utils.copyAttributes($dataField, $timeField, ['class', 'disabled']);
         $timeField
           .addClass('crm-form-text crm-form-time')
-          .attr('placeholder', $dataField.attr('time-placeholder') === undefined ? '\uf017' : $dataField.attr('time-placeholder'))
-          .attr('aria-label', $dataField.attr('time-placeholder') === undefined ? ts('Time') : $dataField.attr('time-placeholder'))
+          // Set default placeholder as clock icon (`fa-clock` is Unicode f017)
+          .attr('placeholder', placeholder === undefined ? '\uf017' : placeholder)
+          .attr('aria-label', placeholder === undefined ? ts('Time') : placeholder)
           .change(updateDataField)
           .timeEntry({
             spinnerImage: '',
             show24Hours: settings.time === true || settings.time === undefined ? CRM.config.timeIs24Hr : settings.time == '24'
           });
+        if (!placeholder) {
+          $timeField.addClass('crm-placeholder-icon');
+        }
       }
       if (settings.date !== false) {
         // Render "number" field for year-only format, calendar popup for all other formats
         $dateField = $('<input type="' + type + '">').insertAfter($dataField);
-        CRM.utils.copyAttributes($dataField, $dateField, ['placeholder', 'style', 'class', 'disabled', 'aria-label']);
+        CRM.utils.copyAttributes($dataField, $dateField, ['style', 'class', 'disabled', 'aria-label']);
+        placeholder = settings.placeholder || $dataField.attr('placeholder');
         $dateField.addClass('crm-form-' + type);
         if (!settings.minDate && !_.isUndefined(settings.start_date_years)) {
           settings.minDate = '' + (new Date().getFullYear() - settings.start_date_years) + '-01-01';
@@ -64,14 +71,16 @@
           if (!settings.yearRange && settings.minDate !== null && settings.maxDate !== null) {
             settings.yearRange = '' + CRM.utils.formatDate(settings.minDate, 'yy') + ':' + CRM.utils.formatDate(settings.maxDate, 'yy');
           }
-          // Set placeholder as calendar icon (`fa-calendar` is Unicode f073)
-          // and add datepicker
-          $dateField.addClass('crm-form-date').attr({placeholder: '\uF073'}).datepicker(settings);
+          $dateField.addClass('crm-form-date').datepicker(settings);
         } else {
           $dateField.attr('min', settings.minDate ? CRM.utils.formatDate(settings.minDate, 'yy') : '1000');
           $dateField.attr('max', settings.maxDate ? CRM.utils.formatDate(settings.maxDate, 'yy') : '4000');
         }
-        $dateField.change(updateDataField);
+        // Set placeholder as calendar icon (`fa-calendar` is Unicode f073)
+        $dateField.attr({placeholder: placeholder === undefined ? '\uF073' : placeholder}).change(updateDataField);
+        if (!placeholder) {
+          $dateField.addClass('crm-placeholder-icon');
+        }
       }
       // Rudimentary validation. TODO: Roll into use of jQUery validate and ui.datepicker.validation
       function isValidDate() {