From 72a5842bd7b517bf9b089f65687a88253d2284e2 Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Thu, 24 Nov 2016 15:04:48 +0800
Subject: [PATCH] MDL-56431 messaging: Added aria label to filter.

Added an aria label to the course filter in the
messaging page.
---
 lang/en/message.php                           |   1 +
 message/amd/build/message_area_search.min.js  | Bin 7868 -> 8075 bytes
 message/amd/src/message_area_search.js        |   4 ++++
 .../templates/message_area_response.mustache  |   1 +
 4 files changed, 6 insertions(+)

diff --git a/lang/en/message.php b/lang/en/message.php
index ded0aeb2da4..3a404a39a0a 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -97,6 +97,7 @@ $string['outputnotconfigured'] = 'Not configured';
 $string['permitted'] = 'Permitted';
 $string['processorsettings'] = 'Processor settings';
 $string['removecontact'] = 'Remove contact';
+$string['removecoursefilter'] = 'Remove filter for course {$a}';
 $string['removefromyourcontacts'] = 'Remove from your contacts';
 $string['requiresconfiguration'] = 'Requires configuration';
 $string['searchforuser'] = 'Search for a user';
diff --git a/message/amd/build/message_area_search.min.js b/message/amd/build/message_area_search.min.js
index 8426361965a7b41b5587c8dca5b75e5324b16886..587f42c1846f26db2e128a6903903a6e9ca89c64 100644
GIT binary patch
delta 140
zcmdmE+ikz$f{dO{s$P0(NqlihQD$DchEh>#Zhl#6a(-!1acWv-PDyH!l8#btYH@L5
zda9C6;^bOs!^sn5coY&#N{Td;5{ohub#oGvQgeWEnzedKnRzK1B^jB;nv>7VoS4kP
WCl69A4l&dbT?<f+=;qb3f{Xw#(J~|e

delta 16
XcmeCS-($Psg3RO?+2fnj<Wv~}KUM~i

diff --git a/message/amd/src/message_area_search.js b/message/amd/src/message_area_search.js
index dd248efad34..584f4f8c488 100644
--- a/message/amd/src/message_area_search.js
+++ b/message/amd/src/message_area_search.js
@@ -383,6 +383,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
         this.messageArea.find(SELECTORS.CONTACTSAREA).addClass('searchfilter');
         this.messageArea.find(SELECTORS.SEARCHFILTERAREA).show();
         this.messageArea.find(SELECTORS.SEARCHFILTER).html(text);
+        Str.get_string('removecoursefilter', 'message', text).then(function(languagestring) {
+            this.messageArea.find(SELECTORS.SEARCHFILTERAREA).attr('aria-label', languagestring);
+        }.bind(this));
     };
 
     /**
@@ -394,6 +397,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
         this.messageArea.find(SELECTORS.CONTACTSAREA).removeClass('searchfilter');
         this.messageArea.find(SELECTORS.SEARCHFILTER).empty();
         this.messageArea.find(SELECTORS.SEARCHFILTERAREA).hide();
+        this.messageArea.find(SELECTORS.SEARCHFILTERAREA).removeAttr('aria-label');
     };
 
     /**
diff --git a/message/templates/message_area_response.mustache b/message/templates/message_area_response.mustache
index f224c867c7d..f7de5456bee 100644
--- a/message/templates/message_area_response.mustache
+++ b/message/templates/message_area_response.mustache
@@ -19,6 +19,7 @@
         rows="1"
         data-auto-rows
         data-max-rows="5"
+        role="textbox"
         aria-label="{{#str}} writeamessage, message {{/str}}"
         placeholder="{{#str}} writeamessage, message {{/str}}"></textarea>
 </div>
-- 
2.17.1