github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 09:11:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure discussion list subtrees don't go missing. Fixes #66

Browse Source
This commit is contained in:
Toby Zerner 2015-05-11 10:47:42 +09:30
parent c25ee7035a
commit ac29ecaffe
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/forum/src/components/composer-discussion.js
View File

@ -65,7 +65,7 @@ export default class ComposerDiscussion extends ComposerBody {
app.store.createRecord('discussions').save(data).then(discussion => {
app.composer.hide();
app.cache.discussionList.discussions().unshift(discussion);
app.cache.discussionList.addDiscussion(discussion);
m.route(app.route('discussion', { id: discussion.id(), slug: discussion.slug() }));
}, response => {
this.loading(false);

17
framework/core/js/forum/src/components/discussion-list.js
View File

@ -24,10 +24,6 @@ export default class DiscussionList extends Component {
app.session.on('loggedIn', this.loggedInHandler = this.refresh.bind(this))
}
addSubtrees(discussions) {
}
params() {
var params = {};
for (var i in this.props.params) {
@ -78,11 +74,15 @@ export default class DiscussionList extends Component {
this.loadResults(this.discussions().length).then((results) => this.parseResults(results));
}
initSubtree(discussion) {
this.subtrees[discussion.id()] = new SubtreeRetainer(() => discussion.freshness);
}
parseResults(results) {
m.startComputation();
this.loading(false);
results.forEach(discussion => this.subtrees[discussion.id()] = new SubtreeRetainer(() => discussion.freshness));
results.forEach(this.initSubtree.bind(this));
[].push.apply(this.discussions(), results);
this.moreResults(!!results.payload.links.next);
@ -104,6 +104,11 @@ export default class DiscussionList extends Component {
}
}
addDiscussion(discussion) {
this.discussions().unshift(discussion);
this.initSubtree(discussion);
}
view() {
return m('div', [
m('ul.discussions-list', [
@ -119,7 +124,7 @@ export default class DiscussionList extends Component {
var active = m.route().substr(0, discussionRoute.length) === discussionRoute;
var subtree = this.subtrees[discussion.id()];
return m('li.discussion-summary'+(isUnread ? '.unread' : '')+(active ? '.active' : ''), {key: discussion.id(), 'data-id': discussion.id()}, subtree.retain() || m('div', [
return m('li.discussion-summary'+(isUnread ? '.unread' : '')+(active ? '.active' : ''), {key: discussion.id(), 'data-id': discussion.id()}, (subtree && subtree.retain()) || m('div', [
controls.length ? DropdownButton.component({
items: controls,
className: 'contextual-controls',