mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00
Code Issues Releases Wiki Activity

Combine route/query params in route construction

Browse Source 
One params object is passed, and then route params are extracted into
the route and the rest are appended as query params.
This commit is contained in:
Toby Zerner
2015-05-02 08:21:40 +09:30
parent 72be607a17
commit 68c0cdb1a9
10 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/forum/src/components/discussion-list.js
View File

@@ -115,7 +115,7 @@ export default class DiscussionList extends Component {
var controls = this.controlItems(discussion).toArray();
var discussionRoute = app.route('discussion', discussion);
var discussionRoute = app.route('discussion', { id: discussion.id(), slug: discussion.slug() });
var active = m.route().substr(0, discussionRoute.length) === discussionRoute;
return m('li.discussion-summary'+(isUnread ? '.unread' : '')+(active ? '.active' : ''), {key: discussion.id()}, [
@@ -126,7 +126,7 @@ export default class DiscussionList extends Component {
menuClass: 'pull-right'
}) : '',
m('a.author', {
href: app.route('user', startUser),
href: app.route('user', { username: startUser.username() }),
config: function(element, isInitialized, context) {
$(element).tooltip({ placement: 'right' })
m.route.call(this, element)