From ca70c422989c0b72684e6aa6f45ffa1a894db13d Mon Sep 17 00:00:00 2001 From: Ivan Tanev Date: Thu, 21 Sep 2017 10:27:19 +0300 Subject: [PATCH 1/5] Make hide_rsults_on_select option apply for deselecting as well --- coffee/chosen.jquery.coffee | 2 +- coffee/chosen.proto.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 203af36aeda..93b5f544dac 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -325,7 +325,7 @@ class Chosen extends AbstractChosen else this.show_search_field_default() - this.results_hide() if @is_multiple and this.choices_count() > 0 and this.get_search_field_value().length < 1 + this.results_hide() if @is_multiple and this.hide_results_on_select and this.choices_count() > 0 and this.get_search_field_value().length < 1 link.parents('li').first().remove() diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index 654a905507f..e25f057d8b6 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -317,7 +317,7 @@ class @Chosen extends AbstractChosen else this.show_search_field_default() - this.results_hide() if @is_multiple and this.choices_count() > 0 and this.get_search_field_value().length < 1 + this.results_hide() if @is_multiple and this.hide_results_on_select and this.choices_count() > 0 and this.get_search_field_value().length < 1 link.up('li').remove() From d719289408f808be74d64b027b1361872c444eb5 Mon Sep 17 00:00:00 2001 From: Ivan Tanev Date: Fri, 28 Sep 2018 10:29:28 +0300 Subject: [PATCH 2/5] Do not scroll the selection dropdown up on select when `hide_results_on_select` is set --- coffee/chosen.jquery.coffee | 2 +- coffee/chosen.proto.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 5ec19f51adb..614eaad61df 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -373,7 +373,7 @@ class Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey + if evt.metaKey or evt.ctrlKey or !@hide_results_on_select this.winnow_results(skip_highlight: true) else @search_field.val("") diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index 24109243feb..41f53a3f25b 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -365,7 +365,7 @@ class @Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey + if evt.metaKey or evt.ctrlKey or !@hide_results_on_select this.winnow_results(skip_highlight: true) else @search_field.value = "" From 7fcd58e1f7b3a6f133c7253615476c92d2379d47 Mon Sep 17 00:00:00 2001 From: Ivan Tanev Date: Wed, 3 Oct 2018 13:49:40 +0300 Subject: [PATCH 3/5] Fix new hide_results_on_select behavior should only be applied on mouse result selection --- coffee/chosen.jquery.coffee | 2 +- coffee/chosen.proto.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 614eaad61df..1a99fdb0f57 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -373,7 +373,7 @@ class Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey or !@hide_results_on_select + if evt.metaKey or evt.ctrlKey or (!@hide_results_on_select && evt.originalEvent instanceof MouseEvent) this.winnow_results(skip_highlight: true) else @search_field.val("") diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index 41f53a3f25b..d11dc963279 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -365,7 +365,7 @@ class @Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey or !@hide_results_on_select + if evt.metaKey or evt.ctrlKey or (!@hide_results_on_select && evt instanceof MouseEvent) this.winnow_results(skip_highlight: true) else @search_field.value = "" From 5e01649f11798717a98bb4800187afc5f558872c Mon Sep 17 00:00:00 2001 From: Ivan Tanev Date: Thu, 4 Oct 2018 11:11:36 +0300 Subject: [PATCH 4/5] Revert "Fix new hide_results_on_select behavior should only be applied on mouse result selection" This reverts commit 7fcd58e1f7b3a6f133c7253615476c92d2379d47. --- coffee/chosen.jquery.coffee | 2 +- coffee/chosen.proto.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 1a99fdb0f57..614eaad61df 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -373,7 +373,7 @@ class Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey or (!@hide_results_on_select && evt.originalEvent instanceof MouseEvent) + if evt.metaKey or evt.ctrlKey or !@hide_results_on_select this.winnow_results(skip_highlight: true) else @search_field.val("") diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index d11dc963279..41f53a3f25b 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -365,7 +365,7 @@ class @Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey or (!@hide_results_on_select && evt instanceof MouseEvent) + if evt.metaKey or evt.ctrlKey or !@hide_results_on_select this.winnow_results(skip_highlight: true) else @search_field.value = "" From b91699da9fc2b9a74b573179e9011109d518a389 Mon Sep 17 00:00:00 2001 From: Ivan Tanev Date: Thu, 4 Oct 2018 11:12:05 +0300 Subject: [PATCH 5/5] Revert "Do not scroll the selection dropdown up on select when `hide_results_on_select` is set" This reverts commit d719289408f808be74d64b027b1361872c444eb5. --- coffee/chosen.jquery.coffee | 2 +- coffee/chosen.proto.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 614eaad61df..5ec19f51adb 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -373,7 +373,7 @@ class Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey or !@hide_results_on_select + if evt.metaKey or evt.ctrlKey this.winnow_results(skip_highlight: true) else @search_field.val("") diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index 41f53a3f25b..24109243feb 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -365,7 +365,7 @@ class @Chosen extends AbstractChosen this.single_set_selected_text(this.choice_label(item)) if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) - if evt.metaKey or evt.ctrlKey or !@hide_results_on_select + if evt.metaKey or evt.ctrlKey this.winnow_results(skip_highlight: true) else @search_field.value = ""