github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-22 07:19:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Toby Zerner 2015-05-02 08:45:52 +09:30
parent d48dd2747a
commit 6d3e3e5c29
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/forum/src/components/terminal-post.js
View File

@ -15,7 +15,7 @@ export default class TerminalPost extends Component {
var discussion = this.props.discussion; var discussion = this.props.discussion;
var lastPost = this.props.lastPost && discussion.repliesCount(); var lastPost = this.props.lastPost && discussion.repliesCount();
return m('li', [ return m('span', [
m('span.username', discussion[lastPost ? 'lastUser' : 'startUser']().username()), m('span.username', discussion[lastPost ? 'lastUser' : 'startUser']().username()),
lastPost ? ' replied ' : ' started ', lastPost ? ' replied ' : ' started ',
m('time', humanTime(discussion[lastPost ? 'lastTime' : 'startTime']())) m('time', humanTime(discussion[lastPost ? 'lastTime' : 'startTime']()))

4
framework/core/js/lib/components/nav-item.js
View File

@ -3,11 +3,11 @@ import icon from 'flarum/helpers/icon'
export default class NavItem extends Component { export default class NavItem extends Component {
view() { view() {
var active = NavItem.active(this.props); var active = this.constructor.active(this.props);
return m('li'+(active ? '.active' : ''), m('a', {href: this.props.href, config: m.route}, [ return m('li'+(active ? '.active' : ''), m('a', {href: this.props.href, config: m.route}, [
icon(this.props.icon+' icon'), icon(this.props.icon+' icon'),
this.props.label, ' ', this.props.label, ' ',
m('span.count', this.props.badge) this.props.badge ? m('span.count', this.props.badge) : ''
])) ]))
} }