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

Fix #1172 -- Properly set width when allowClear is being used.

Browse Source 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
This commit is contained in:
Julen Ruiz Aizpuru 2013-04-11 22:25:52 +02:00 committed by Igor Vaynberg
parent 25549c787b
commit 8cb3698820
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
select2.css
View File

@ -81,6 +81,10 @@ Version: @@ver@@ Timestamp: @@timestamp@@
background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%); background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%);
} }
.select2-container.select2-allowclear .select2-choice span {
margin-right: 42px;
}
.select2-container .select2-choice span { .select2-container .select2-choice span {
margin-right: 26px; margin-right: 26px;
display: block; display: block;
@ -94,11 +98,11 @@ Version: @@ver@@ Timestamp: @@timestamp@@
} }
.select2-container .select2-choice abbr { .select2-container .select2-choice abbr {
display: block; display: inline-block;
width: 12px; width: 12px;
height: 12px; height: 12px;
position: absolute; position: absolute;
right: 26px; right: 24px;
top: 8px; top: 8px;
font-size: 1px; font-size: 1px;
@ -171,7 +175,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
} }
.select2-container .select2-choice div { .select2-container .select2-choice div {
display: block; display: inline-block;
width: 18px; width: 18px;
height: 100%; height: 100%;
position: absolute; position: absolute;

2
select2.js
View File

@ -1944,6 +1944,7 @@ the specific language governing permissions and limitations under the Apache Lic
this.selection.addClass("select2-default"); this.selection.addClass("select2-default");
this.container.removeClass("select2-allowclear");
this.selection.find("abbr").hide(); this.selection.find("abbr").hide();
} }
}, },
@ -2022,6 +2023,7 @@ the specific language governing permissions and limitations under the Apache Lic
this.selection.removeClass("select2-default"); this.selection.removeClass("select2-default");
if (this.opts.allowClear && this.getPlaceholder() !== undefined) { if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
this.container.addClass("select2-allowclear");
this.selection.find("abbr").show(); this.selection.find("abbr").show();
} }
}, },