Merge branch 'featuer/image-on-diff' of https://github.com/team-lab/gitbucket into team-lab-featuer/image-on-diff

# Conflicts:
#	src/main/webapp/assets/common/js/gitbucket.js
This commit is contained in:
Naoki Takezoe
2015-05-25 02:06:14 +09:00
6 changed files with 391 additions and 13 deletions

View File

@@ -107,7 +107,7 @@ $(function(){
$(".no-results").hide();
for(var i=0;i < p.length;i++){
var row = template.clone();
row.find("a").attr("href",pathBase+"/"+p[i].string).html(string_score_hilight(p[i], '<b>'));
row.find("a").attr("href",pathBase+"/"+p[i].string).html(string_score_highlight(p[i], '<b>'));
if(cursor==i){
row.addClass("navigation-focus");
}