mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-05 16:07:34 +02:00
Code Issues Releases Wiki Activity

Fix m.withAttr for input value, show search results, fix some old m.route code

Browse Source 
TODO: Fix "SyntaxError: '> li:not(.Dropdown-header)' is not a valid selector" when hovering search results in navbar
This commit is contained in:
David Sevilla Martin
2019-10-22 19:05:51 -04:00
parent c037598537
commit b885346029
10 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/common/utils/patchMithril.ts
View File

@@ -2,7 +2,7 @@ import prop from 'mithril/stream';
export default () => {
m.withAttr = (key: string, cb: Function) => function () {
cb(this.getAttribute(key));
cb(this.getAttribute(key) || this[key]);
};
m.prop = prop;

2
js/src/forum/Forum.ts
View File

@@ -16,6 +16,8 @@ export default class Forum extends Application {
'user.posts': { path: '/u/:username', component: PostsUserPage },
'user.discussions': { path: '/u/:username', component: PostsUserPage },
'settings': { path: '/u/:username', component: PostsUserPage },
'discussion': { path: '/d/:id', IndexPage },
};
/**

4
js/src/forum/components/DiscussionsSearchSource.tsx
View File

@@ -43,10 +43,10 @@ export default class DiscussionsSearchSource extends SearchSource {
return (
<li className="DiscussionSearchResult" data-index={'discussions' + discussion.id()}>
<a href={app.route.discussion(discussion, mostRelevantPost && mostRelevantPost.number())} config={m.route}>
<m.route.Link href={app.route.discussion(discussion, mostRelevantPost && mostRelevantPost.number())}>
<div className="DiscussionSearchResult-title">{highlight(discussion.title(), query)}</div>
{mostRelevantPost ? <div className="DiscussionSearchResult-excerpt">{highlight(mostRelevantPost.contentPlain(), query, 100)}</div> : ''}
</a>
</m.route.Link>
</li>
);
})

7
js/src/forum/components/NotificationList.tsx
View File

@@ -76,12 +76,11 @@ export default class NotificationList extends Component {
<div className="NotificationGroup">
{group.discussion
? (
<a className="NotificationGroup-header"
href={app.route.discussion(group.discussion)}
config={m.route}>
<m.route.Link className="NotificationGroup-header"
href={app.route.discussion(group.discussion)}>
{badges && badges.length ? <ul className="NotificationGroup-badges badges">{listItems(badges)}</ul> : ''}
{group.discussion.title()}
</a>
</m.route.Link>
) : (
<div className="NotificationGroup-header">
{app.forum.attribute('title')}

2
js/src/forum/components/NotificationsDropdown.tsx
View File

@@ -54,7 +54,7 @@ export default class NotificationsDropdown extends Dropdown {
}
goToRoute() {
m.route(app.route('notifications'));
m.route.set(app.route('notifications'));
}
getUnreadCount() {

10
js/src/forum/components/PostsUserPage.tsx
View File

@@ -33,7 +33,13 @@ export default class PostsUserPage extends UserPage {
oninit(vnode) {
super.oninit(vnode);
this.loadUser(m.route.param('username'));
this.loadUser(vnode.attrs.username);
}
onupdate(vnode) {
super.onupdate(vnode);
this.loadUser(vnode.attrs.username);
}
content() {
@@ -69,7 +75,7 @@ export default class PostsUserPage extends UserPage {
{this.posts.map(post => (
<li>
<div className="PostsUserPage-discussion">
{app.translator.trans('core.forum.user.in_discussion_text', {discussion: <a href={app.route.post(post)} oncreate={m.route}>{post.discussion().title()}</a>})}
{app.translator.trans('core.forum.user.in_discussion_text', {discussion: <m.route.Link href={app.route.post(post)}>{post.discussion().title()}</m.route.Link>})}
</div>
{CommentPost.component({post})}
</li>

2
js/src/forum/components/Search.tsx
View File

@@ -185,7 +185,7 @@ export default class Search extends Component {
this.loadingSources = 0;
if (this.value()) {
m.route(this.getItem(this.index).find('a').attr('href'));
m.route.set(this.getItem(this.index).find('a').attr('href'));
} else {
this.clear();
}

4
js/src/forum/components/UserCard.tsx
View File

@@ -48,10 +48,10 @@ export default class UserCard extends Component<UserCardProps> {
{this.props.editable
? [AvatarEditor.component({user, className: 'UserCard-avatar'}), username(user)]
: (
<a href={app.route.user(user)} oncreate={m.route}>
<m.route.Link href={app.route.user(user)}>
<div className="UserCard-avatar">{avatar(user)}</div>
{username(user)}
</a>
</m.route.Link>
)}
</h2>

10
js/src/forum/components/UserPage.tsx
View File

@@ -22,6 +22,11 @@ export default abstract class UserPage extends Page {
user: User;
bodyClass: string = 'App--user';
/**
* The username of the currently loaded user
*/
username: string;
view() {
return (
<div className="UserPage">
@@ -54,7 +59,6 @@ export default abstract class UserPage extends Page {
*/
abstract content();
/**
* Initialize the component with a user, and trigger the loading of their
* activity feed.
@@ -74,6 +78,10 @@ export default abstract class UserPage extends Page {
loadUser(username: string) {
const lowercaseUsername = username.toLowerCase();
if (lowercaseUsername == this.username) return;
this.username = lowercaseUsername;
app.store.all('users').some(user => {
if (user.username().toLowerCase() === lowercaseUsername && user.joinTime()) {
this.show(user);

10
js/src/forum/components/UsersSearchSource.tsx
View File

@@ -37,14 +37,20 @@ export default class UsersSearchSource extends SearchSource {
<li className="Dropdown-header">{app.translator.trans('core.forum.search.users_heading')}</li>,
results.map(user => {
const name = username(user);
if (!name.children) {
name.children = [name.text];
delete name.text;
}
name.children[0] = highlight(name.children[0], query);
return (
<li className="UserSearchResult" data-index={'users' + user.id()}>
<a href={app.route.user(user)} oncreate={m.route}>
<m.route.Link href={app.route.user(user)}>
{avatar(user)}
{name}
</a>
</m.route.Link>
</li>
);
})