Merge pull request #1852 from vcuculo/fix-search-user
fixed user search + avatar
This commit is contained in:
commit
50e7d2a254
1 changed files with 4 additions and 4 deletions
|
|
@ -32,9 +32,9 @@
|
||||||
return Diaspora.I18n.t("search_for", row);
|
return Diaspora.I18n.t("search_for", row);
|
||||||
} else {
|
} else {
|
||||||
return $("<img/>", {
|
return $("<img/>", {
|
||||||
'class': "avatar",
|
"class": "avatar",
|
||||||
src: row.avatar
|
src: row.avatar
|
||||||
}).html() + row.name;
|
})[0].outerHTML + row.name;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -63,11 +63,11 @@
|
||||||
if (data['search'] === true) { // The placeholder "search for" result
|
if (data['search'] === true) { // The placeholder "search for" result
|
||||||
window.location = self.searchFormAction + '?' + self.searchInputName + '=' + data['name'];
|
window.location = self.searchFormAction + '?' + self.searchInputName + '=' + data['name'];
|
||||||
} else { // The actual result
|
} else { // The actual result
|
||||||
element.val(formatted);
|
self.options.element.val(formatted);
|
||||||
window.location = data['url'];
|
window.location = data['url'];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
Diaspora.Widgets.Search = Search;
|
Diaspora.Widgets.Search = Search;
|
||||||
})();
|
})();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue