prevent scrollback left on opening. fixes #467
This commit is contained in:
parent
13c1dcbf67
commit
43e6b86f75
18
select2.css
18
select2.css
@ -223,12 +223,6 @@ Version: @@ver@@ Timestamp: @@timestamp@@
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.select2-search-hidden {
|
|
||||||
display: block;
|
|
||||||
position: absolute;
|
|
||||||
left: -10000px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.select2-search input {
|
.select2-search input {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
@ -619,16 +613,16 @@ disabled look for disabled choices in the results dropdown
|
|||||||
}
|
}
|
||||||
|
|
||||||
.select2-offscreen {
|
.select2-offscreen {
|
||||||
border: 0;
|
|
||||||
clip: rect(0 0 0 0);
|
clip: rect(0 0 0 0);
|
||||||
height: 1;
|
width: 1px;
|
||||||
|
height: 1px;
|
||||||
|
border: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
overflow: hidden;
|
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
overflow: hidden;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 1;
|
outline: none;
|
||||||
display:block;
|
left: 0px;
|
||||||
left: -10000px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.select2-display-none {
|
.select2-display-none {
|
||||||
|
14
select2.js
14
select2.js
@ -1775,7 +1775,7 @@ the specific language governing permissions and limitations under the Apache Lic
|
|||||||
container = this.container,
|
container = this.container,
|
||||||
dropdown = this.dropdown;
|
dropdown = this.dropdown;
|
||||||
|
|
||||||
this.showSearch(this.opts.minimumResultsForSearch >= 0);
|
this.showSearch(false);
|
||||||
|
|
||||||
this.selection = selection = container.find(".select2-choice");
|
this.selection = selection = container.find(".select2-choice");
|
||||||
|
|
||||||
@ -2038,12 +2038,13 @@ the specific language governing permissions and limitations under the Apache Lic
|
|||||||
this.highlight(selected);
|
this.highlight(selected);
|
||||||
}
|
}
|
||||||
|
|
||||||
// hide the search box if this is the first we got the results and there are a few of them
|
// show the search box if this is the first we got the results and there are enough of them for search
|
||||||
|
|
||||||
if (initial === true) {
|
if (initial === true) {
|
||||||
var min=this.opts.minimumResultsForSearch;
|
var min=this.opts.minimumResultsForSearch;
|
||||||
showSearchInput = min < 0 ? false : countResults(data.results) >= min;
|
if (min>=0) {
|
||||||
this.showSearch(showSearchInput);
|
this.showSearch(countResults(data.results)>=min);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
@ -2052,9 +2053,10 @@ the specific language governing permissions and limitations under the Apache Lic
|
|||||||
showSearch: function(showSearchInput) {
|
showSearch: function(showSearchInput) {
|
||||||
this.showSearchInput = showSearchInput;
|
this.showSearchInput = showSearchInput;
|
||||||
|
|
||||||
this.dropdown.find(".select2-search")[showSearchInput ? "removeClass" : "addClass"]("select2-search-hidden");
|
this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput);
|
||||||
|
this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput);
|
||||||
//add "select2-with-searchbox" to the container if search box is shown
|
//add "select2-with-searchbox" to the container if search box is shown
|
||||||
$(this.dropdown, this.container)[showSearchInput ? "addClass" : "removeClass"]("select2-with-searchbox");
|
$(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput);
|
||||||
},
|
},
|
||||||
|
|
||||||
// single
|
// single
|
||||||
|
Loading…
Reference in New Issue
Block a user