mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-29 04:30:56 +02:00
Code Issues Releases Wiki Activity

Make mention formatter work in live preview 🎉

Browse Source
This commit is contained in:
Toby Zerner
2015-07-23 20:50:41 +09:30
parent b300323fb7
commit 7ac3e9fa92
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/mentions/src/Listeners/AddPostMentionsFormatter.php
View File

@@ -19,11 +19,16 @@ class AddPostMentionsFormatter
$tagName = 'POSTMENTION'; $tagName = 'POSTMENTION';
$tag = $configurator->tags->add($tagName); $tag = $configurator->tags->add($tagName);
$tag->attributes->add('username'); $tag->attributes->add('username');
$tag->attributes->add('number'); $tag->attributes->add('number');
$tag->attributes->add('id')->filterChain->append('#uint'); $tag->attributes->add('id')->filterChain->append('#uint');
$tag->attributes['id']->required = false;
$tag->template = '<a href="{$DISCUSSION_URL}{@number}" class="PostMention" data-number="{@number}"><xsl:value-of select="@username"/></a>'; $tag->template = '<a href="{$DISCUSSION_URL}{@number}" class="PostMention" data-number="{@number}"><xsl:value-of select="@username"/></a>';
$tag->filterChain->prepend([static::class, 'addId'])->addParameterByName('post'); $tag->filterChain->prepend([static::class, 'addId'])
->addParameterByName('post')
->setJS('function() { return true; }');
$configurator->Preg->match('/\B@(?<username>[a-z0-9_-]+)#(?<number>\d+)/i', $tagName); $configurator->Preg->match('/\B@(?<username>[a-z0-9_-]+)#(?<number>\d+)/i', $tagName);
} }
@@ -40,8 +45,10 @@ class AddPostMentionsFormatter
->where('number', $tag->getAttribute('number')) ->where('number', $tag->getAttribute('number'))
->pluck('id'); ->pluck('id');
$tag->setAttribute('id', $id); if ($id) {
$tag->setAttribute('id', $id);
return true; return true;
}
} }
} }

12
extensions/mentions/src/Listeners/AddUserMentionsFormatter.php
View File

@@ -30,8 +30,12 @@ class AddUserMentionsFormatter
$tag = $configurator->tags->add($tagName); $tag = $configurator->tags->add($tagName);
$tag->attributes->add('username'); $tag->attributes->add('username');
$tag->attributes->add('id')->filterChain->append('#uint'); $tag->attributes->add('id')->filterChain->append('#uint');
$tag->attributes['id']->required = false;
$tag->template = '<a href="{$PROFILE_URL}{@username}" class="UserMention">@<xsl:value-of select="@username"/></a>'; $tag->template = '<a href="{$PROFILE_URL}{@username}" class="UserMention">@<xsl:value-of select="@username"/></a>';
$tag->filterChain->prepend([static::class, 'addId'])->addParameterByName('userRepository'); $tag->filterChain->prepend([static::class, 'addId'])
->addParameterByName('userRepository')
->setJS('function() { return true; }');
$configurator->Preg->match('/\B@(?<username>[a-z0-9_-]+)(?!#)/i', $tagName); $configurator->Preg->match('/\B@(?<username>[a-z0-9_-]+)(?!#)/i', $tagName);
} }
@@ -49,8 +53,10 @@ class AddUserMentionsFormatter
public static function addId($tag, UserRepository $users) public static function addId($tag, UserRepository $users)
{ {
$tag->setAttribute('id', $users->getIdForUsername($tag->getAttribute('username'))); if ($id = $users->getIdForUsername($tag->getAttribute('username'))) {
$tag->setAttribute('id', $id);
return true; return true;
}
} }
} }