mirror of
https://github.com/flarum/framework.git
synced 2025-05-21 22:36:01 +08:00
c28307903b
HTMLBars goodness! Since there was some breakage and a lot of fiddling around to get some things working, I took this opportunity to do a big cleanup of the whole Ember app. I accidentally worked on some new features too :3 Note that the app is still broken right now, pending on https://github.com/emberjs/ember.js/issues/10401 Cleanup: - Restructuring of components - Consolidation of some stuff into mixins, cleanup of some APIs that will be public - Change all instances of .property() / .observes() / .on() to Ember.computed() / Ember.observer() / Ember.on() respectively (I think it is more readable) - More comments - Start conforming to a code style (2 spaces for indentation) New features: - Post hiding/restoring - Mark individual discussions as read by clicking - Clicking on a read discussion jumps to the end - Mark all discussions as read - Progressively mark the discussion as read as the page is scrolled - Unordered list post formatting - Post permalink popup Demo once that Ember regression is fixed!
110 lines
3.1 KiB
JavaScript
110 lines
3.1 KiB
JavaScript
import Ember from 'ember';
|
|
|
|
import DiscussionResult from 'flarum/models/discussion-result';
|
|
import PostResult from 'flarum/models/post-result';
|
|
|
|
export default Ember.Controller.extend({
|
|
needs: ['application'],
|
|
|
|
queryParams: ['sort', 'show', {searchQuery: 'q'}, 'filter'],
|
|
sort: 'recent',
|
|
show: 'discussions',
|
|
filter: '',
|
|
searchQuery: '',
|
|
|
|
meta: null,
|
|
resultsLoading: false,
|
|
|
|
sortOptions: [
|
|
{key: 'recent', label: 'Recent', sort: 'recent'},
|
|
{key: 'replies', label: 'Replies', sort: '-replies'},
|
|
{key: 'newest', label: 'Newest', sort: '-created'},
|
|
{key: 'oldest', label: 'Oldest', sort: 'created'},
|
|
],
|
|
|
|
terminalPostType: Ember.computed('sort', function() {
|
|
return ['newest', 'oldest'].indexOf(this.get('sort')) !== -1 ? 'start' : 'last';
|
|
}),
|
|
|
|
countType: Ember.computed('sort', function() {
|
|
return this.get('sort') === 'replies' ? 'replies' : 'unread';
|
|
}),
|
|
|
|
moreResults: Ember.computed.bool('meta.moreUrl'),
|
|
|
|
getResults: function(start) {
|
|
var searchQuery = this.get('searchQuery');
|
|
var sort = this.get('sort');
|
|
var sortOptions = this.get('sortOptions');
|
|
var sortOption = sortOptions.findBy('key', sort) || sortOptions.objectAt(0);
|
|
|
|
var params = {
|
|
sort: sortOption.sort,
|
|
q: searchQuery,
|
|
start: start
|
|
};
|
|
|
|
if (this.get('show') === 'posts') {
|
|
if (searchQuery) {
|
|
params.include = 'relevantPosts';
|
|
} else if (sort === 'created') {
|
|
params.include = 'startPost,startUser';
|
|
} else {
|
|
params.include = 'lastPost,lastUser';
|
|
}
|
|
}
|
|
|
|
return this.store.find('discussion', params).then(function(discussions) {
|
|
var results = Ember.A();
|
|
discussions.forEach(function(discussion) {
|
|
var relevantPosts = Ember.A();
|
|
// discussion.get('relevantPosts.content').forEach(function(post) {
|
|
// relevantPosts.pushObject(PostResult.create(post));
|
|
// });
|
|
results.pushObject(DiscussionResult.create({
|
|
content: discussion,
|
|
relevantPosts: relevantPosts,
|
|
lastPost: PostResult.create(discussion.get('lastPost')),
|
|
startPost: PostResult.create(discussion.get('startPost'))
|
|
}));
|
|
results.set('meta', discussions.get('meta'));
|
|
});
|
|
return results;
|
|
});
|
|
},
|
|
|
|
searchQueryDidChange: Ember.observer('searchQuery', function() {
|
|
var searchQuery = this.get('searchQuery');
|
|
this.get('controllers.application').setProperties({
|
|
searchQuery: searchQuery,
|
|
searchActive: !!searchQuery
|
|
});
|
|
|
|
var sortOptions = this.get('sortOptions');
|
|
|
|
if (this.get('searchQuery') && sortOptions[0].sort !== 'relevance') {
|
|
sortOptions.unshiftObject({key: 'relevance', label: 'Relevance', sort: 'relevance'});
|
|
} else if (!this.get('searchQuery') && sortOptions[0].sort === 'relevance') {
|
|
sortOptions.shiftObject();
|
|
}
|
|
}),
|
|
|
|
paramsDidChange: Ember.observer('sort', 'show', 'searchQuery', function() {
|
|
if (this.get('model')) {
|
|
this.send('refresh');
|
|
}
|
|
}),
|
|
|
|
actions: {
|
|
loadMore: function() {
|
|
var controller = this;
|
|
this.set('resultsLoading', true);
|
|
this.getResults(this.get('model.length')).then(function(results) {
|
|
controller.get('model').addObjects(results);
|
|
controller.set('meta', results.get('meta'));
|
|
controller.set('resultsLoading', false);
|
|
});
|
|
}
|
|
}
|
|
});
|