AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add aria-label to user mention

Browse Source
This commit is contained in:
Michael Vickers
2020-10-03 12:14:31 +01:00
committed by Frédéric Guillot
parent d418115adc
commit b24d05df76
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Core/Markdown.php
View File

@@ -92,6 +92,7 @@ class Markdown extends Parsedown
if (! empty($user)) { if (! empty($user)) {
$url = $this->container['helper']->url->to('UserViewController', 'profile', array('user_id' => $user['id'])); $url = $this->container['helper']->url->to('UserViewController', 'profile', array('user_id' => $user['id']));
$name = $user['name'] ?: $user['username'];
return array( return array(
'extent' => strlen($username) + 1, 'extent' => strlen($username) + 1,
@@ -101,7 +102,8 @@ class Markdown extends Parsedown
'attributes' => array( 'attributes' => array(
'href' => $url, 'href' => $url,
'class' => 'user-mention-link', 'class' => 'user-mention-link',
'title' => $user['name'] ?: $user['username'], 'title' => $name,
'aria-label' => $name,
), ),
), ),
); );

16
tests/units/Helper/TextHelperTest.php
View File

@@ -67,42 +67,42 @@ class TextHelperTest extends Base
$this->assertEquals(2, $userModel->create(array('username' => 'firstname.lastname', 'name' => 'Firstname Lastname'))); $this->assertEquals(2, $userModel->create(array('username' => 'firstname.lastname', 'name' => 'Firstname Lastname')));
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin">@admin</a> @notfound</p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin" aria-label="admin">@admin</a> @notfound</p>',
$textHelper->markdown('Text @admin @notfound') $textHelper->markdown('Text @admin @notfound')
); );
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin">@admin</a>,</p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin" aria-label="admin">@admin</a>,</p>',
$textHelper->markdown('Text @admin,') $textHelper->markdown('Text @admin,')
); );
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin">@admin</a>!</p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin" aria-label="admin">@admin</a>!</p>',
$textHelper->markdown('Text @admin!') $textHelper->markdown('Text @admin!')
); );
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin">@admin</a>? </p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin" aria-label="admin">@admin</a>? </p>',
$textHelper->markdown('Text @admin? ') $textHelper->markdown('Text @admin? ')
); );
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin">@admin</a>.</p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin" aria-label="admin">@admin</a>.</p>',
$textHelper->markdown('Text @admin.') $textHelper->markdown('Text @admin.')
); );
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin">@admin</a>: test</p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin" aria-label="admin">@admin</a>: test</p>',
$textHelper->markdown('Text @admin: test') $textHelper->markdown('Text @admin: test')
); );
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin">@admin</a>: test</p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=1" class="user-mention-link" title="admin" aria-label="admin">@admin</a>: test</p>',
$textHelper->markdown('Text @admin: test') $textHelper->markdown('Text @admin: test')
); );
$this->assertEquals( $this->assertEquals(
'<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=2" class="user-mention-link" title="Firstname Lastname">@firstname.lastname</a>. test</p>', '<p>Text <a href="?controller=UserViewController&amp;action=profile&amp;user_id=2" class="user-mention-link" title="Firstname Lastname" aria-label="Firstname Lastname">@firstname.lastname</a>. test</p>',
$textHelper->markdown('Text @firstname.lastname. test') $textHelper->markdown('Text @firstname.lastname. test')
); );