github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: highlight in yellow, not blue

Browse Source 
FEATURE: highlight in title
This commit is contained in:
Sam 2014-09-04 15:01:01 +10:00
parent ba4363d8fc
commit 0ade9bafff
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/highlight.js
View File

@ -70,7 +70,7 @@ jQuery.extend({
});
jQuery.fn.unhighlight = function (options) {
var settings = { className: 'highlight', element: 'span' };
var settings = { className: 'highlight-strong', element: 'span' };
jQuery.extend(settings, options);
return this.find(settings.element + "." + settings.className).each(function () {
@ -81,7 +81,7 @@ jQuery.fn.unhighlight = function (options) {
};
jQuery.fn.highlight = function (words, options) {
var settings = { className: 'highlight', element: 'span', caseSensitive: false, wordsOnly: false };
var settings = { className: 'highlight-strong', element: 'span', caseSensitive: false, wordsOnly: false };
jQuery.extend(settings, options);
if (words.constructor === String) {

2
app/assets/javascripts/discourse/views/post_view.js
View File

@ -289,7 +289,7 @@ Discourse.PostView = Discourse.GroupedView.extend(Ember.Evented, {
if(this._highlighted){
cooked.unhighlight();
}
cooked.highlight(highlight);
cooked.highlight(highlight.split(/\s+/));
this._highlighted = true;
} else if(this._highlighted){

8
app/assets/javascripts/discourse/views/search-results-type.js.es6
View File

@ -4,5 +4,11 @@ export default Ember.CollectionView.extend({
tagName: 'li',
classNameBindings: ['selected'],
templateName: Discourse.computed.fmt('parentView.displayType', "search/%@_result")
})
}),
didInsertElement: function(){
var term = this.get('controller.term');
if(!_.isEmpty(term)) {
this.$().highlight(term.split(/\s+/));
}
}
});

4
app/assets/stylesheets/common/base/header.scss
View File

@ -335,3 +335,7 @@
padding: 4px 6px;
margin-left: 6px;
}
.highlight-strong {
background-color: dark-light-diff($highlight, $secondary, 40%, -50%);
}

8
lib/search/grouped_search_results.rb
View File

@ -30,13 +30,7 @@ class Search
terms = @term.split(/\s+/)
blurb = TextHelper.excerpt(cooked, terms.first, radius: 100)
blurb = TextHelper.truncate(cooked, length: 200) if blurb.blank?
blurb = Sanitize.clean(blurb)
terms.each do |term|
blurb.gsub!(Regexp.new("(#{Regexp.escape(term)})", Regexp::IGNORECASE), "<span class='highlighted'>\\1</span>")
end
blurb
Sanitize.clean(blurb)
end
def add(object)

2
spec/components/search_spec.rb
View File

@ -145,7 +145,7 @@ describe Search do
p = result.posts[0]
p.topic.id.should == topic.id
p.id.should == reply.id
result.blurb(p).should == "this reply has no <span class='highlighted'>quotes</span>"
result.blurb(p).should == "this reply has no quotes"
end
end

2
spec/controllers/search_controller_spec.rb
View File

@ -15,7 +15,7 @@ describe SearchController do
response.should be_success
data = JSON.parse(response.body)
data['posts'][0]['id'].should == my_post.id
data['posts'][0]['blurb'].should == 'this is my really <span class=\'highlighted\'>awesome</span> post'
data['posts'][0]['blurb'].should == 'this is my really awesome post'
data['topics'][0]['id'].should == my_post.topic_id
end
end