Hide the search clear icon in webkit
The search box previously displayed a clear icon on the far right side in webkit-based browsers, specifically Chrome and Safari. This hides the clear icon in those browsers, and also fixes a slight sizing issue, so it should no longer be displayed. This also disables autocorrect, autocompleted, as well as a few other automatic search corrections on the field, so mobile devices should have a better experience. This closes https://github.com/select2/select2/issues/3018.
This commit is contained in:
parent
b1c016584b
commit
4dda5e7a74
5
dist/css/select2.css
vendored
5
dist/css/select2.css
vendored
@ -35,9 +35,12 @@
|
|||||||
.select2-container .select2-search--inline {
|
.select2-container .select2-search--inline {
|
||||||
float: left; }
|
float: left; }
|
||||||
.select2-container .select2-search--inline .select2-search__field {
|
.select2-container .select2-search--inline .select2-search__field {
|
||||||
|
box-sizing: border-box;
|
||||||
border: none;
|
border: none;
|
||||||
font-size: 100%;
|
font-size: 100%;
|
||||||
margin-top: 5px; }
|
margin-top: 5px; }
|
||||||
|
.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
|
||||||
|
-webkit-appearance: none; }
|
||||||
|
|
||||||
.select2-dropdown {
|
.select2-dropdown {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
@ -85,6 +88,8 @@
|
|||||||
padding: 4px;
|
padding: 4px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box; }
|
box-sizing: border-box; }
|
||||||
|
.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
|
||||||
|
-webkit-appearance: none; }
|
||||||
.select2-search--dropdown.select2-search--hide {
|
.select2-search--dropdown.select2-search--hide {
|
||||||
display: none; }
|
display: none; }
|
||||||
|
|
||||||
|
2
dist/css/select2.min.css
vendored
2
dist/css/select2.min.css
vendored
File diff suppressed because one or more lines are too long
6
dist/js/select2.amd.full.js
vendored
6
dist/js/select2.amd.full.js
vendored
@ -1228,7 +1228,8 @@ define('select2/selection/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<li class="select2-search select2-search--inline">' +
|
'<li class="select2-search select2-search--inline">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</li>'
|
'</li>'
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -3131,7 +3132,8 @@ define('select2/dropdown/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<span class="select2-search select2-search--dropdown">' +
|
'<span class="select2-search select2-search--dropdown">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</span>'
|
'</span>'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
6
dist/js/select2.amd.js
vendored
6
dist/js/select2.amd.js
vendored
@ -1228,7 +1228,8 @@ define('select2/selection/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<li class="select2-search select2-search--inline">' +
|
'<li class="select2-search select2-search--inline">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</li>'
|
'</li>'
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -3131,7 +3132,8 @@ define('select2/dropdown/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<span class="select2-search select2-search--dropdown">' +
|
'<span class="select2-search select2-search--dropdown">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</span>'
|
'</span>'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
6
dist/js/select2.full.js
vendored
6
dist/js/select2.full.js
vendored
@ -1666,7 +1666,8 @@ define('select2/selection/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<li class="select2-search select2-search--inline">' +
|
'<li class="select2-search select2-search--inline">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</li>'
|
'</li>'
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -3569,7 +3570,8 @@ define('select2/dropdown/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<span class="select2-search select2-search--dropdown">' +
|
'<span class="select2-search select2-search--dropdown">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</span>'
|
'</span>'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
4
dist/js/select2.full.min.js
vendored
4
dist/js/select2.full.min.js
vendored
File diff suppressed because one or more lines are too long
6
dist/js/select2.js
vendored
6
dist/js/select2.js
vendored
@ -1666,7 +1666,8 @@ define('select2/selection/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<li class="select2-search select2-search--inline">' +
|
'<li class="select2-search select2-search--inline">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</li>'
|
'</li>'
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -3569,7 +3570,8 @@ define('select2/dropdown/search',[
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<span class="select2-search select2-search--dropdown">' +
|
'<span class="select2-search select2-search--dropdown">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</span>'
|
'</span>'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
4
dist/js/select2.min.js
vendored
4
dist/js/select2.min.js
vendored
File diff suppressed because one or more lines are too long
3
src/js/select2/dropdown/search.js
vendored
3
src/js/select2/dropdown/search.js
vendored
@ -10,7 +10,8 @@ define([
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<span class="select2-search select2-search--dropdown">' +
|
'<span class="select2-search select2-search--dropdown">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</span>'
|
'</span>'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
3
src/js/select2/selection/search.js
vendored
3
src/js/select2/selection/search.js
vendored
@ -11,7 +11,8 @@ define([
|
|||||||
var $search = $(
|
var $search = $(
|
||||||
'<li class="select2-search select2-search--inline">' +
|
'<li class="select2-search select2-search--inline">' +
|
||||||
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
'<input class="select2-search__field" type="search" tabindex="-1"' +
|
||||||
' role="textbox" />' +
|
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
|
||||||
|
' spellcheck="false" role="textbox" />' +
|
||||||
'</li>'
|
'</li>'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -61,6 +61,10 @@
|
|||||||
padding: 4px;
|
padding: 4px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
|
&::-webkit-search-cancel-button {
|
||||||
|
-webkit-appearance: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.select2-search--hide {
|
&.select2-search--hide {
|
||||||
|
@ -21,8 +21,13 @@
|
|||||||
float: left;
|
float: left;
|
||||||
|
|
||||||
.select2-search__field {
|
.select2-search__field {
|
||||||
|
box-sizing: border-box;
|
||||||
border: none;
|
border: none;
|
||||||
font-size: 100%;
|
font-size: 100%;
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
|
|
||||||
|
&::-webkit-search-cancel-button {
|
||||||
|
-webkit-appearance: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ test('empty update clears the selection', function (assert) {
|
|||||||
assert.equal($rendered.text(), '');
|
assert.equal($rendered.text(), '');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('escapePlaceholder is being used', function (assert) {
|
test('escapeMarkup is being used', function (assert) {
|
||||||
var selection = new MultipleSelection(
|
var selection = new MultipleSelection(
|
||||||
$('#qunit-fixture .multiple'),
|
$('#qunit-fixture .multiple'),
|
||||||
options
|
options
|
||||||
|
@ -65,7 +65,7 @@ test('update renders the data text', function (assert) {
|
|||||||
assert.equal($rendered.text(), 'test');
|
assert.equal($rendered.text(), 'test');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('escapePlaceholder is being used', function (assert) {
|
test('escapeMarkup is being used', function (assert) {
|
||||||
var selection = new SingleSelection(
|
var selection = new SingleSelection(
|
||||||
$('#qunit-fixture .single'),
|
$('#qunit-fixture .single'),
|
||||||
options
|
options
|
||||||
|
Loading…
x
Reference in New Issue
Block a user