mirror of
https://github.com/flarum/core.git
synced 2025-07-30 21:20:24 +02:00
Upgrade to Ember 1.11-beta.1
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!
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import Ember from 'ember';
|
||||
|
||||
import DiscussionResult from '../../models/discussion-result';
|
||||
import PostResult from '../../models/post-result';
|
||||
import DiscussionResult from 'flarum/models/discussion-result';
|
||||
import PostResult from 'flarum/models/post-result';
|
||||
|
||||
export default Ember.Controller.extend({
|
||||
needs: ['application'],
|
||||
@@ -22,17 +22,15 @@ export default Ember.Controller.extend({
|
||||
{key: 'oldest', label: 'Oldest', sort: 'created'},
|
||||
],
|
||||
|
||||
terminalPostType: function() {
|
||||
terminalPostType: Ember.computed('sort', function() {
|
||||
return ['newest', 'oldest'].indexOf(this.get('sort')) !== -1 ? 'start' : 'last';
|
||||
}.property('sort'),
|
||||
}),
|
||||
|
||||
countType: function() {
|
||||
countType: Ember.computed('sort', function() {
|
||||
return this.get('sort') === 'replies' ? 'replies' : 'unread';
|
||||
}.property('sort'),
|
||||
}),
|
||||
|
||||
moreResults: function() {
|
||||
return !!this.get('meta.moreUrl');
|
||||
}.property('meta.moreUrl'),
|
||||
moreResults: Ember.computed.bool('meta.moreUrl'),
|
||||
|
||||
getResults: function(start) {
|
||||
var searchQuery = this.get('searchQuery');
|
||||
@@ -75,9 +73,12 @@ export default Ember.Controller.extend({
|
||||
});
|
||||
},
|
||||
|
||||
searchQueryDidChange: function() {
|
||||
this.get('controllers.application').set('searchQuery', this.get('searchQuery'));
|
||||
this.get('controllers.application').set('searchActive', !! this.get('searchQuery'));
|
||||
searchQueryDidChange: Ember.observer('searchQuery', function() {
|
||||
var searchQuery = this.get('searchQuery');
|
||||
this.get('controllers.application').setProperties({
|
||||
searchQuery: searchQuery,
|
||||
searchActive: !!searchQuery
|
||||
});
|
||||
|
||||
var sortOptions = this.get('sortOptions');
|
||||
|
||||
@@ -86,13 +87,13 @@ export default Ember.Controller.extend({
|
||||
} else if (!this.get('searchQuery') && sortOptions[0].sort === 'relevance') {
|
||||
sortOptions.shiftObject();
|
||||
}
|
||||
}.observes('searchQuery'),
|
||||
}),
|
||||
|
||||
paramsDidChange: function() {
|
||||
paramsDidChange: Ember.observer('sort', 'show', 'searchQuery', function() {
|
||||
if (this.get('model')) {
|
||||
this.send('refresh');
|
||||
}
|
||||
}.observes('sort', 'show', 'searchQuery'),
|
||||
}),
|
||||
|
||||
actions: {
|
||||
loadMore: function() {
|
||||
|
Reference in New Issue
Block a user