From 064a5b913ec3a3acd13434dde8fd32c91d2d64df Mon Sep 17 00:00:00 2001 From: Alex Bolshego Date: Tue, 9 Jul 2019 21:27:51 +0300 Subject: [PATCH 1/4] Update init.js --- .../javascripts/active_admin/searchable_select/init.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/active_admin/searchable_select/init.js b/app/assets/javascripts/active_admin/searchable_select/init.js index f0eaa32..8e9a2ac 100644 --- a/app/assets/javascripts/active_admin/searchable_select/init.js +++ b/app/assets/javascripts/active_admin/searchable_select/init.js @@ -6,6 +6,11 @@ // reading from data allows // to be passed to select2 var options = $.extend(extra || {}, item.data('searchableSelect')); + + // default option allow clear + if (options.allowClear != undefined) + options.allowClear: true + var url = item.data('ajaxUrl'); if (url) { @@ -43,4 +48,4 @@ $(function() { initSearchableSelects($(".searchable-select-input")); }); -}()); \ No newline at end of file +}()); From e116a8d30fd03b6c5652cec6bbcbd570a942593f Mon Sep 17 00:00:00 2001 From: Alex Bolshego Date: Tue, 9 Jul 2019 21:31:45 +0300 Subject: [PATCH 2/4] Update init.js --- app/assets/javascripts/active_admin/searchable_select/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/active_admin/searchable_select/init.js b/app/assets/javascripts/active_admin/searchable_select/init.js index 8e9a2ac..81ef380 100644 --- a/app/assets/javascripts/active_admin/searchable_select/init.js +++ b/app/assets/javascripts/active_admin/searchable_select/init.js @@ -9,7 +9,7 @@ // default option allow clear if (options.allowClear != undefined) - options.allowClear: true + options.allowClear = true; var url = item.data('ajaxUrl'); From b1a4928bc9b293198cf73939dc9f9598c0683a96 Mon Sep 17 00:00:00 2001 From: Alex Bolshego Date: Tue, 9 Jul 2019 21:38:55 +0300 Subject: [PATCH 3/4] Update init.js --- app/assets/javascripts/active_admin/searchable_select/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/active_admin/searchable_select/init.js b/app/assets/javascripts/active_admin/searchable_select/init.js index 81ef380..b1b210c 100644 --- a/app/assets/javascripts/active_admin/searchable_select/init.js +++ b/app/assets/javascripts/active_admin/searchable_select/init.js @@ -8,7 +8,7 @@ var options = $.extend(extra || {}, item.data('searchableSelect')); // default option allow clear - if (options.allowClear != undefined) + if (options.allowClear == undefined) options.allowClear = true; var url = item.data('ajaxUrl'); From 3bd7ca0fd0e62583e4f7ce1dcbaff3030733a4d9 Mon Sep 17 00:00:00 2001 From: Alex Bolshego Date: Tue, 9 Jul 2019 21:45:08 +0300 Subject: [PATCH 4/4] Update init.js --- .../javascripts/active_admin/searchable_select/init.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/active_admin/searchable_select/init.js b/app/assets/javascripts/active_admin/searchable_select/init.js index b1b210c..c51e3a0 100644 --- a/app/assets/javascripts/active_admin/searchable_select/init.js +++ b/app/assets/javascripts/active_admin/searchable_select/init.js @@ -7,7 +7,10 @@ // to be passed to select2 var options = $.extend(extra || {}, item.data('searchableSelect')); - // default option allow clear + // default option allow clear (must have placeholder and allowClear to options) + if (options.placeholder == undefined) + options.placeholder = ''; + if (options.allowClear == undefined) options.allowClear = true;