Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

order by latest and views filters 

sane wrapping for large text in excerpt
This commit is contained in:
Sam 2015-06-23 11:01:10 +10:00
parent 0768a3b2e9
commit b593a8db92
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
View File

@ -26,7 +26,19 @@ var controllerOpts = {
changeSort: function(sortBy) {
if (this.get('isSearch')) {
// TODO we should amend search string here
var term = this.get('searchTerm');
var order;
if (sortBy === 'activity') { order = 'latest'; }
if (sortBy === 'views') { order = 'views'; }
if (order && term.indexOf("order:" + order) === -1) {
term = term.replace(/order:[a-z]+/, '');
term = term.trim() + " order:" + order;
this.set('model.params.q', term);
this.get('model').refreshSort();
}
} else {
if (sortBy === this.get('order')) {
this.toggleProperty('ascending');

11
app/assets/javascripts/discourse/views/topic-list-item.js.es6
View File

@ -139,10 +139,15 @@ export default Discourse.View.extend(StringBuffer, {
const self = this;
if (term) {
var terms = term.split(/\s+/);
// .main-link a is omitted cause a bit clowny
var excerpt = self.$('.topic-excerpt');
// some sane wrapping
excerpt.text(excerpt.text().replace(/\S{40,}/g, function(match){
return match.replace(/(\S)/g, "$1\u200B");
}));
terms.forEach(function(word) {
// .main-link a is omitted cause a bit clowny
self.$('.topic-excerpt')
.highlight(word, {element: 'b', className: 'search-highlight'});
excerpt.highlight(word, {element: 'b', className: 'search-highlight'});
});
}
}.on('didInsertElement')