mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-29 19:09:58 +02:00
Code Issues Releases Wiki Activity

Use Link component instead of route patch

Browse Source
This commit is contained in:
Alexander Skvortsov
2020-10-02 20:51:03 -04:00
parent 955309cc5f
commit c2bb7d45f6
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/tags/js/src/forum/components/TagLinkButton.js
View File

@@ -1,3 +1,4 @@
import Link from 'flarum/components/Link';
import LinkButton from 'flarum/components/LinkButton'; import LinkButton from 'flarum/components/LinkButton';
import classList from 'flarum/utils/classList'; import classList from 'flarum/utils/classList';
import tagIcon from '../../common/helpers/tagIcon'; import tagIcon from '../../common/helpers/tagIcon';
@@ -15,12 +16,12 @@ export default class TagLinkButton extends LinkButton {
]); ]);
return ( return (
<a className={className} route={this.attrs.route} <Link className={className} href={this.attrs.route}
style={active && tag ? {color: tag.color()} : ''} style={active && tag ? {color: tag.color()} : ''}
title={description || ''}> title={description || ''}>
{tagIcon(tag, {className: 'Button-icon'})} {tagIcon(tag, {className: 'Button-icon'})}
{tag ? tag.name() : app.translator.trans('flarum-tags.forum.index.untagged_link')} {tag ? tag.name() : app.translator.trans('flarum-tags.forum.index.untagged_link')}
</a> </Link>
); );
} }

15
extensions/tags/js/src/forum/components/TagsPage.js
View File

@@ -1,5 +1,6 @@
import Page from 'flarum/components/Page'; import Page from 'flarum/components/Page';
import IndexPage from 'flarum/components/IndexPage'; import IndexPage from 'flarum/components/IndexPage';
import Link from 'flarum/components/Link';
import listItems from 'flarum/helpers/listItems'; import listItems from 'flarum/helpers/listItems';
import humanTime from 'flarum/helpers/humanTime'; import humanTime from 'flarum/helpers/humanTime';
@@ -36,29 +37,29 @@ export default class TagsPage extends Page {
return ( return (
<li className={'TagTile ' + (tag.color() ? 'colored' : '')} <li className={'TagTile ' + (tag.color() ? 'colored' : '')}
style={{backgroundColor: tag.color()}}> style={{backgroundColor: tag.color()}}>
<a className="TagTile-info" route={app.route.tag(tag)}> <Link className="TagTile-info" href={app.route.tag(tag)}>
<h3 className="TagTile-name">{tag.name()}</h3> <h3 className="TagTile-name">{tag.name()}</h3>
<p className="TagTile-description">{tag.description()}</p> <p className="TagTile-description">{tag.description()}</p>
{children {children
? ( ? (
<div className="TagTile-children"> <div className="TagTile-children">
{children.map(child => [ {children.map(child => [
<a route={app.route.tag(child)}> <Link href={app.route.tag(child)}>
{child.name()} {child.name()}
</a>, </Link>,
' ' ' '
])} ])}
</div> </div>
) : ''} ) : ''}
</a> </Link>
{lastPostedDiscussion {lastPostedDiscussion
? ( ? (
<a className="TagTile-lastPostedDiscussion" <Link className="TagTile-lastPostedDiscussion"
route={app.route.discussion(lastPostedDiscussion, lastPostedDiscussion.lastPostNumber())} href={app.route.discussion(lastPostedDiscussion, lastPostedDiscussion.lastPostNumber())}
> >
<span className="TagTile-lastPostedDiscussion-title">{lastPostedDiscussion.title()}</span> <span className="TagTile-lastPostedDiscussion-title">{lastPostedDiscussion.title()}</span>
{humanTime(lastPostedDiscussion.lastPostedAt())} {humanTime(lastPostedDiscussion.lastPostedAt())}
</a> </Link>
) : ( ) : (
<span className="TagTile-lastPostedDiscussion"/> <span className="TagTile-lastPostedDiscussion"/>
)} )}