Skip to content
This repository has been archived by the owner on Oct 2, 2019. It is now read-only.

fix(spinner-class): add glyphicon to default spinner class, update css #1894

Merged
merged 2 commits into from
Mar 7, 2017
Merged

fix(spinner-class): add glyphicon to default spinner class, update css #1894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f69db
fix(spinner-class): add glyphicon to default spinner class, update cs…
Jan 25, 2017
2d62e0b
fix(select-spinner): fix spec test
Jan 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,17 +317,10 @@ body > .ui-select-bootstrap.open {
}

/* Spinner */
.ui-select-refreshing {
.ui-select-refreshing.glyphicon {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the ui-select-refreshing.glyphicon be as one selector?

position: absolute;
right: 0;
padding: 8px 27px;
top: 1px;
display: inline-block;
font-family: 'Glyphicons Halflings';
font-style: normal;
font-weight: normal;
line-height: 1;
-webkit-font-smoothing:antialiased;
}

@-webkit-keyframes ui-select-spin {
Expand Down
2 changes: 1 addition & 1 deletion src/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ var uis = angular.module('ui.select', [])
},
appendToBody: false,
spinnerEnabled: false,
spinnerClass: 'glyphicon-refresh ui-select-spin',
spinnerClass: 'glyphicon glyphicon-refresh ui-select-spin',
backspaceReset: true
})

Expand Down
2 changes: 1 addition & 1 deletion test/select.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3189,7 +3189,7 @@ describe('ui-select tests', function() {

it('should have a default value of glyphicon-refresh ui-select-spin', function () {
var control = createUiSelect();
expect(control.scope().$select.spinnerClass).toEqual('glyphicon-refresh ui-select-spin');
expect(control.scope().$select.spinnerClass).toEqual('glyphicon glyphicon-refresh ui-select-spin');
});

it('should have set a custom class value of randomclass', function () {
Expand Down