Skip to content

Commit 3ca264b

Browse files
committed
[frontend] select helper enhancements
1 parent bde8305 commit 3ca264b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

frontend/express/public/javascripts/countly/countly.helpers.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -1189,12 +1189,14 @@
11891189
}
11901190

11911191
$(".cly-select").find(".search").remove();
1192+
$(".cly-multi-select").find(".search").remove();
11921193

11931194
if (selectItems.is(":visible")) {
11941195
$(context).removeClass("active");
11951196
}
11961197
else {
11971198
$(".cly-select").removeClass("active");
1199+
$(".cly-multi-select").removeClass("active");
11981200
$(".select-items").hide();
11991201
$(context).addClass("active");
12001202

@@ -1430,7 +1432,7 @@
14301432

14311433
$.fn.clySelectSetSelection = function(value, name) {
14321434
$(this).find(".select-inner .text").data("value", value);
1433-
$(this).find(".select-inner .text").text(name);
1435+
$(this).find(".select-inner .text").text($('<div>').html(name).text());
14341436
$(this).trigger("cly-select-change", [value]);
14351437
};
14361438
};
@@ -1465,12 +1467,14 @@
14651467
return false;
14661468
}
14671469

1470+
$(".cly-select").find(".search").remove();
14681471
$(".cly-multi-select").find(".search").remove();
14691472

14701473
if (selectItems.is(":visible")) {
14711474
$(this).removeClass("active");
14721475
}
14731476
else {
1477+
$(".cly-select").removeClass("active");
14741478
$(".cly-multi-select").removeClass("active");
14751479
$(".select-items").hide();
14761480
$(this).addClass("active");
@@ -1705,7 +1709,7 @@
17051709

17061710
var $selection = $("<div class='selection'></div>");
17071711

1708-
$selection.text(name);
1712+
$selection.text($('<div>').html(name).text());
17091713
$selection.attr("data-value", value);
17101714
$selection.append("<div class='remove'><i class='ion-android-close'></i></div>");
17111715

0 commit comments

Comments
 (0)