Skip to content

Commit

Permalink
Merge pull request #45 from SengitU/master
Browse files Browse the repository at this point in the history
 Resolved a scenario that leads to no selected class on selected option
  • Loading branch information
bcinarli authored Dec 21, 2016
2 parents 059e4fc + 6ea68c2 commit df811e3
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 43 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uxrocket.select",
"version": "3.5.9",
"version": "3.5.10",
"homepage": "https://github.com/uxrocket/uxrocket.select",
"authors": [
"Bilal Çınarlı <[email protected]>"
Expand Down
35 changes: 4 additions & 31 deletions dist/uxrocket.select.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
border-radius: 50%;
border: dashed 2px #ccc;
background-color: #fff;
-webkit-animation: uxr-select-loading 2s infinite linear;
animation: uxr-select-loading 2s infinite linear;
animation: uxr-select-loading 2s infinite linear;
content: "";
}

Expand All @@ -73,8 +72,7 @@

.uxr-select-multiple.uxr-select-opened .uxr-select-selection-text:after {
content: "|";
-webkit-animation: uxr-select-blink linear infinite 1s;
animation: uxr-select-blink linear infinite 1s;
animation: uxr-select-blink linear infinite 1s;
}

.uxr-select-disabled, .uxr-select-disabled:hover {
Expand Down Expand Up @@ -224,18 +222,6 @@
display: none;
}

@-webkit-keyframes uxr-select-blink {
0% {
opacity: 0;
}
50% {
opacity: 0;
}
100% {
opacity: 1;
}
}

@keyframes uxr-select-blink {
0% {
opacity: 0;
Expand All @@ -248,24 +234,11 @@
}
}

@-webkit-keyframes uxr-select-loading {
from {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}

@keyframes uxr-select-loading {
from {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
transform: rotate(0deg);
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
transform: rotate(360deg);
}
}
3 changes: 2 additions & 1 deletion dist/uxrocket.select.js
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@
}

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

if(this.options.displayType === 'tags') {
Expand Down Expand Up @@ -1178,7 +1179,7 @@
});

// version
ux.version = '3.5.9';
ux.version = '3.5.10';

// default settings
ux.settings = defaults;
Expand Down
6 changes: 3 additions & 3 deletions dist/uxrocket.select.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit df811e3

Please sign in to comment.