Skip to content

Commit df811e3

Browse files
authored
Merge pull request #45 from SengitU/master
Resolved a scenario that leads to no selected class on selected option
2 parents 059e4fc + 6ea68c2 commit df811e3

10 files changed

Lines changed: 21 additions & 43 deletions

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "uxrocket.select",
3-
"version": "3.5.9",
3+
"version": "3.5.10",
44
"homepage": "https://github.com/uxrocket/uxrocket.select",
55
"authors": [
66
"Bilal Çınarlı <bcinarli@gmail.com>"

dist/uxrocket.select.css

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
border-radius: 50%;
5151
border: dashed 2px #ccc;
5252
background-color: #fff;
53-
-webkit-animation: uxr-select-loading 2s infinite linear;
54-
animation: uxr-select-loading 2s infinite linear;
53+
animation: uxr-select-loading 2s infinite linear;
5554
content: "";
5655
}
5756

@@ -73,8 +72,7 @@
7372

7473
.uxr-select-multiple.uxr-select-opened .uxr-select-selection-text:after {
7574
content: "|";
76-
-webkit-animation: uxr-select-blink linear infinite 1s;
77-
animation: uxr-select-blink linear infinite 1s;
75+
animation: uxr-select-blink linear infinite 1s;
7876
}
7977

8078
.uxr-select-disabled, .uxr-select-disabled:hover {
@@ -224,18 +222,6 @@
224222
display: none;
225223
}
226224

227-
@-webkit-keyframes uxr-select-blink {
228-
0% {
229-
opacity: 0;
230-
}
231-
50% {
232-
opacity: 0;
233-
}
234-
100% {
235-
opacity: 1;
236-
}
237-
}
238-
239225
@keyframes uxr-select-blink {
240226
0% {
241227
opacity: 0;
@@ -248,24 +234,11 @@
248234
}
249235
}
250236

251-
@-webkit-keyframes uxr-select-loading {
252-
from {
253-
-webkit-transform: rotate(0deg);
254-
transform: rotate(0deg);
255-
}
256-
to {
257-
-webkit-transform: rotate(360deg);
258-
transform: rotate(360deg);
259-
}
260-
}
261-
262237
@keyframes uxr-select-loading {
263238
from {
264-
-webkit-transform: rotate(0deg);
265-
transform: rotate(0deg);
239+
transform: rotate(0deg);
266240
}
267241
to {
268-
-webkit-transform: rotate(360deg);
269-
transform: rotate(360deg);
242+
transform: rotate(360deg);
270243
}
271244
}

dist/uxrocket.select.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@
546546
}
547547

548548
this.$el.find('[value="' + value + '"]').prop('selected', true);
549+
this.$list.find('#' + optionID).addClass(selected);
549550
$option.addClass(selected);
550551

551552
if(this.options.displayType === 'tags') {
@@ -1178,7 +1179,7 @@
11781179
});
11791180

11801181
// version
1181-
ux.version = '3.5.9';
1182+
ux.version = '3.5.10';
11821183

11831184
// default settings
11841185
ux.settings = defaults;

dist/uxrocket.select.min.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)