summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--install/ui/widget.js19
1 files changed, 7 insertions, 12 deletions
diff --git a/install/ui/widget.js b/install/ui/widget.js
index 4a02cb7d..0c07d655 100644
--- a/install/ui/widget.js
+++ b/install/ui/widget.js
@@ -1670,12 +1670,7 @@ IPA.combobox_widget = function(spec) {
keypress: function(e) {
if (e.which == 13) { // Enter
var filter = that.filter.val();
- that.search(
- filter,
- function(data, text_status, xhr) {
- that.select(filter);
- }
- );
+ that.search(filter);
}
}
}).appendTo(div);
@@ -1685,12 +1680,7 @@ IPA.combobox_widget = function(spec) {
icon: 'search-icon',
click: function() {
var filter = that.filter.val();
- that.search(
- filter,
- function(data, text_status, xhr) {
- that.select(filter);
- }
- );
+ that.search(filter);
return false;
}
}).appendTo(div);
@@ -1783,11 +1773,16 @@ IPA.combobox_widget = function(spec) {
var option;
if (value) {
+ // select specified value
option = $('option[value="'+value+'"]', that.list);
} else {
+ // select first available option
option = $('option', that.list).first();
}
+ // if no option found, skip
+ if (!option.length) return;
+
option.attr('selected', 'selected');
that.set_value(option.val());