Merge pull request #12500 from pradpnayak/28

[civicrm-core.git] / js / Common.js

diff --git a/js/Common.js b/js/Common.js
index 43cc526b7213c192b4d2e000f7634bbe9720f7b6..8a5306763778e4b27059c4a0e07e57a9bd870545 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -690,6 +690,7 @@ if (!CRM.vars) CRM.vars = {};
         $timeField
           .addClass('crm-form-text crm-form-time')
           .attr('placeholder', $dataField.attr('time-placeholder') === undefined ? ts('Time') : $dataField.attr('time-placeholder'))
+          .attr('aria-label', $dataField.attr('time-placeholder') === undefined ? ts('Time') : $dataField.attr('time-placeholder'))
           .change(updateDataField)
           .timeEntry({
             spinnerImage: '',
@@ -699,7 +700,7 @@ if (!CRM.vars) CRM.vars = {};
       if (settings.date !== false) {
         // Render "number" field for year-only format, calendar popup for all other formats
         $dateField = $('<input type="' + type + '">').insertAfter($dataField);
-        copyAttributes($dataField, $dateField, ['placeholder', 'style', 'class', 'disabled']);
+        copyAttributes($dataField, $dateField, ['placeholder', 'style', 'class', 'disabled', 'aria-label']);
         $dateField.addClass('crm-form-' + type);
         if (hasDatepicker) {
           settings.minDate = settings.minDate ? CRM.utils.makeDate(settings.minDate) : null;
@@ -1246,7 +1247,7 @@ if (!CRM.vars) CRM.vars = {};
         unique: true
       };
       options = $.extend(extra, options);
-      options.expires = options.expires === false ? 0 : parseInt(options.expires, 10);
+      options.expires = (options.expires === false || !CRM.config.allowAlertAutodismissal) ? 0 : parseInt(options.expires, 10);
       if (options.unique && options.unique !== '0') {
         $('#crm-notification-container .ui-notify-message').each(function () {
           if (title === $('h1', this).html() && text === $('.notify-content', this).html()) {