From 03a15e070bf555bc7ce3b1a5eab3e6ba3f611bfd Mon Sep 17 00:00:00 2001 From: Valdas Petrulis Date: Mon, 20 Oct 2014 17:24:37 +0300 Subject: [PATCH 1/3] After clearSearch nextSearchTerm is not cleared https://github.com/ivaynberg/select2/issues/2753 --- select2.js | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/select2.js b/select2.js index 625c786c..077e6cf7 100644 --- a/select2.js +++ b/select2.js @@ -814,8 +814,6 @@ the specific language governing permissions and limitations under the Apache Lic // focusin can cause focus wars between modals and select2 since the dropdown is outside the modal. this.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); }); - this.nextSearchTerm = undefined; - if ($.isFunction(this.opts.initSelection)) { // initialize selection based on the current value of the source element this.initSelection(); @@ -1499,6 +1497,23 @@ the specific language governing permissions and limitations under the Apache Lic }, + /** + * @private + */ + prefillNextSearchTerm: function () { + // initializes search's value with nextSearchTerm (if defined by user) + // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter + if(this.search.val() !== "") { + return; + } + + var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.search.val()); + if(nextSearchTerm != undefined){ + this.search.val(nextSearchTerm); + this.search.select(); + } + }, + //abstract getMaximumSelectionSize: function() { return evaluate(this.opts.maximumSelectionSize, this.opts.element); @@ -2015,14 +2030,7 @@ the specific language governing permissions and limitations under the Apache Lic } } - // initializes search's value with nextSearchTerm (if defined by user) - // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter - if(this.search.val() === "") { - if(this.nextSearchTerm != undefined){ - this.search.val(this.nextSearchTerm); - this.search.select(); - } - } + this.prefillNextSearchTerm(); this.focusser.prop("disabled", true).val(""); this.updateResults(true); @@ -2310,7 +2318,6 @@ the specific language governing permissions and limitations under the Apache Lic self.updateSelection(selected); self.close(); self.setPlaceholder(); - self.nextSearchTerm = self.opts.nextSearchTerm(selected, self.search.val()); } }); } @@ -2447,7 +2454,6 @@ the specific language governing permissions and limitations under the Apache Lic this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data }); - this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val()); this.close(); if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) { @@ -2914,16 +2920,9 @@ the specific language governing permissions and limitations under the Apache Lic this.focusSearch(); - // initializes search's value with nextSearchTerm (if defined by user) - // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter - if(this.search.val() === "") { - if(this.nextSearchTerm != undefined){ - this.search.val(this.nextSearchTerm); - this.search.select(); - } - } - + this.prefillNextSearchTerm(); this.updateResults(true); + if (this.opts.shouldFocusInput(this)) { this.search.focus(); } @@ -2989,9 +2988,6 @@ the specific language governing permissions and limitations under the Apache Lic this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data }); - // keep track of the search's value before it gets cleared - this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val()); - this.clearSearch(); this.updateResults(); @@ -3010,11 +3006,8 @@ the specific language governing permissions and limitations under the Apache Lic this.updateResults(true); } else { // initializes search's value with nextSearchTerm and update search result - if(this.nextSearchTerm != undefined){ - this.search.val(this.nextSearchTerm); - this.updateResults(); - this.search.select(); - } + this.prefillNextSearchTerm(); + this.updateResults(); } this.positionDropdown(); } else { From 0cc0ac43f524daf919d304d494d69debced6f050 Mon Sep 17 00:00:00 2001 From: Valdas Petrulis Date: Wed, 22 Oct 2014 16:34:28 +0300 Subject: [PATCH 2/3] Fixed not to break use case: setting the new value after someone was just searching with a different value https://github.com/ivaynberg/select2/issues/2751 --- select2.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 077e6cf7..ae04f1a4 100644 --- a/select2.js +++ b/select2.js @@ -814,6 +814,8 @@ the specific language governing permissions and limitations under the Apache Lic // focusin can cause focus wars between modals and select2 since the dropdown is outside the modal. this.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); }); + this.lastSearchTerm = undefined; + if ($.isFunction(this.opts.initSelection)) { // initialize selection based on the current value of the source element this.initSelection(); @@ -1507,7 +1509,7 @@ the specific language governing permissions and limitations under the Apache Lic return; } - var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.search.val()); + var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.lastSearchTerm); if(nextSearchTerm != undefined){ this.search.val(nextSearchTerm); this.search.select(); @@ -2318,6 +2320,7 @@ the specific language governing permissions and limitations under the Apache Lic self.updateSelection(selected); self.close(); self.setPlaceholder(); + self.lastSearchTerm = self.search.val(); } }); } @@ -2454,6 +2457,7 @@ the specific language governing permissions and limitations under the Apache Lic this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data }); + this.lastSearchTerm = this.search.val(); this.close(); if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) { @@ -2988,6 +2992,9 @@ the specific language governing permissions and limitations under the Apache Lic this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data }); + // keep track of the search's value before it gets cleared + this.lastSearchTerm = this.search.val(); + this.clearSearch(); this.updateResults(); From c1f338cfbf53be4217d47482bfc0a7f309d6ffce Mon Sep 17 00:00:00 2001 From: Valdas Petrulis Date: Thu, 23 Oct 2014 10:04:39 +0300 Subject: [PATCH 3/3] Dont update the results if the term hasn't changed. https://github.com/ivaynberg/select2/issues/2751 --- select2.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/select2.js b/select2.js index ae04f1a4..09c37cc1 100644 --- a/select2.js +++ b/select2.js @@ -1500,20 +1500,24 @@ the specific language governing permissions and limitations under the Apache Lic }, /** + * @return {Boolean} Whether or not search value was changed. * @private */ prefillNextSearchTerm: function () { // initializes search's value with nextSearchTerm (if defined by user) // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter if(this.search.val() !== "") { - return; + return false; } var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.lastSearchTerm); - if(nextSearchTerm != undefined){ + if(nextSearchTerm !== undefined){ this.search.val(nextSearchTerm); this.search.select(); + return true; } + + return false; }, //abstract @@ -3013,8 +3017,9 @@ the specific language governing permissions and limitations under the Apache Lic this.updateResults(true); } else { // initializes search's value with nextSearchTerm and update search result - this.prefillNextSearchTerm(); - this.updateResults(); + if (this.prefillNextSearchTerm()) { + this.updateResults(); + } } this.positionDropdown(); } else {