RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-25 14:26:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2755 from kupishkis/2753

Browse Source 
After clearSearch nextSearchTerm is not cleared
This commit is contained in:
Kevin Brown 2014-11-21 08:47:35 -05:00
commit f382f3d02d
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
select2.js
View File

@ -814,7 +814,7 @@ 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. // 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.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); });
this.nextSearchTerm = undefined; this.lastSearchTerm = undefined;
if ($.isFunction(this.opts.initSelection)) { if ($.isFunction(this.opts.initSelection)) {
// initialize selection based on the current value of the source element // initialize selection based on the current value of the source element
@ -1500,6 +1500,27 @@ 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 false;
}
var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.lastSearchTerm);
if(nextSearchTerm !== undefined){
this.search.val(nextSearchTerm);
this.search.select();
return true;
}
return false;
},
//abstract //abstract
getMaximumSelectionSize: function() { getMaximumSelectionSize: function() {
return evaluate(this.opts.maximumSelectionSize, this.opts.element); return evaluate(this.opts.maximumSelectionSize, this.opts.element);
@ -2016,14 +2037,7 @@ the specific language governing permissions and limitations under the Apache Lic
} }
} }
// initializes search's value with nextSearchTerm (if defined by user) this.prefillNextSearchTerm();
// 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.focusser.prop("disabled", true).val(""); this.focusser.prop("disabled", true).val("");
this.updateResults(true); this.updateResults(true);
@ -2318,7 +2332,7 @@ the specific language governing permissions and limitations under the Apache Lic
self.updateSelection(selected); self.updateSelection(selected);
self.close(); self.close();
self.setPlaceholder(); self.setPlaceholder();
self.nextSearchTerm = self.opts.nextSearchTerm(selected, self.search.val()); self.lastSearchTerm = self.search.val();
} }
}); });
} }
@ -2455,7 +2469,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.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data });
this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val()); this.lastSearchTerm = this.search.val();
this.close(); this.close();
if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) { if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) {
@ -2923,16 +2937,9 @@ the specific language governing permissions and limitations under the Apache Lic
this.focusSearch(); this.focusSearch();
// initializes search's value with nextSearchTerm (if defined by user) this.prefillNextSearchTerm();
// 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.updateResults(true); this.updateResults(true);
if (this.opts.shouldFocusInput(this)) { if (this.opts.shouldFocusInput(this)) {
this.search.focus(); this.search.focus();
} }
@ -2999,7 +3006,7 @@ the specific language governing permissions and limitations under the Apache Lic
this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data }); this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data });
// keep track of the search's value before it gets cleared // keep track of the search's value before it gets cleared
this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val()); this.lastSearchTerm = this.search.val();
this.clearSearch(); this.clearSearch();
this.updateResults(); this.updateResults();
@ -3019,10 +3026,8 @@ the specific language governing permissions and limitations under the Apache Lic
this.updateResults(true); this.updateResults(true);
} else { } else {
// initializes search's value with nextSearchTerm and update search result // initializes search's value with nextSearchTerm and update search result
if(this.nextSearchTerm != undefined){ if (this.prefillNextSearchTerm()) {
this.search.val(this.nextSearchTerm);
this.updateResults(); this.updateResults();
this.search.select();
} }
} }
this.positionDropdown(); this.positionDropdown();