s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2018-03-21 09:46:19 +01:00
commit f551902baf
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/webapp/modules/core/externals/suggest/css/suggest-4_3.css vendored
View File

@ -302,13 +302,17 @@ a.fbs-more-link {
margin: 2px 2px -2px 2px;
}
.fbs-item-name label {
.fbs-item-name label, .fbs-item-name span {
font-size: 0.9em;
}
.fbs-item-name label {
color: black;
}
.fbs-item-type,
.fbs-item-name label {
.fbs-item-name label,
.fbs-item-name span {
display: block;
overflow: hidden;
white-space: nowrap;

2
main/webapp/modules/core/externals/suggest/css/suggest-4_3.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
main/webapp/modules/core/externals/suggest/suggest-4_3.js vendored
View File

@ -725,7 +725,11 @@
var css = this.options.css;
var li = $("<li>").addClass(css.item);
var label = $("<label>").text(data.name);
li.append($("<div>").addClass(css.item_name).append(label));
var div = $("<div>").addClass(css.item_name).append(label);
if(data.description) {
div.append($('<span></span>').text(data.description));
}
li.append(div);
return li;
},
@ -1291,6 +1295,9 @@
type.text(data.id);
}
name.prepend(type);
if(data.description) {
name.append($("<span></span>").text(data.description));
}
//console.log("create_item", li);
return li;

9
main/webapp/modules/core/scripts/util/custom-suggest.js
View File

@ -74,6 +74,10 @@ var CustomSuggest = {};
);
data.name = name.text(); // this converts html escaped strings like "&amp;" back to "&"
if (data.description) {
var descriptionSpan = $("<span></span>").text(data.description);
name.append(descriptionSpan);
}
li.append(name);
name.prepend($("<div>").addClass(css.item_type).text(data.id));
@ -134,6 +138,11 @@ var CustomSuggest = {};
.append($.suggest.strongify(data.name || data.guid, response_data.prefix)));
data.name = name.text(); // this converts html escaped strings like "&amp;" back to "&"
if (data.description) {
var descriptionSpan = $("<span></span>").text(data.description);
name.append(descriptionSpan);
}
li.append(name);
name.prepend($("<div>").addClass(css.item_type).text(data.id));