Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 1daa8bc

Browse files
committed
fix(icon): don't guard adding icon class on presence of class attr.
1 parent 6021f94 commit 1daa8bc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/components/icon/iconDirective.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ function mdIconDirective($mdIcon, $mdTheming, $mdAria ) {
255255
}
256256

257257
function shouldUseDefaultFontSet() {
258-
return !scope.fontIcon && !scope.fontSet && !attr.hasOwnProperty('class');
258+
return !scope.fontIcon && !scope.fontSet;
259259
}
260260
}
261261
}

src/components/icon/iconDirective.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('mdIcon directive', function() {
6666

6767
expect(el.attr('md-font-icon')).toBe($scope.font.name);
6868
expect(el.hasClass('step')).toBe(true);
69-
expect(el.hasClass('material-icons')).toBe(false);
69+
expect(el.hasClass('material-icons')).toBe(true);
7070
expect(el.attr('aria-label')).toBe($scope.font.name + $scope.font.size);
7171
expect(el.attr('role')).toBe('img');
7272
})
@@ -79,7 +79,7 @@ describe('mdIcon directive', function() {
7979
el = make( '<md-icon class="md-48">face</md-icon>');
8080

8181
expect(el.text()).toEqual('face');
82-
expect(el.hasClass('material-icons')).toBeFalsy();
82+
expect(el.hasClass('material-icons')).toBeTruthy();
8383
expect(el.hasClass('md-48')).toBeTruthy();
8484
});
8585

@@ -124,7 +124,7 @@ describe('mdIcon directive', function() {
124124
el = make( '<md-icon class="custom-cake"></md-icon>');
125125

126126
expect(el.text()).toEqual('');
127-
expect(el.hasClass('material-icons')).toBeFalsy();
127+
expect(el.hasClass('material-icons')).toBeTruthy();
128128
expect(el.hasClass('custom-cake')).toBeTruthy();
129129
});
130130

0 commit comments

Comments
 (0)