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

Commit ec336c7

Browse files
topherfangioThomasBurleson
authored andcommitted
fix(fabToolbar): Fix md-direction attribute to be a string instead of expression.
Fix `md-direction` attribute to use the correct scope initialization. Fixes #3390. Closes #4185.
1 parent 7fd8b09 commit ec336c7

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

src/components/fabToolbar/demoBasicUsage/index.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
</p>
1313
</md-content>
1414

15-
<md-fab-toolbar md-open="demo.isOpen" count="demo.count" md-direction="demo.selectedDirection">
15+
<md-fab-toolbar md-open="demo.isOpen" count="demo.count"
16+
md-direction="{{demo.selectedDirection}}">
1617
<md-fab-trigger class="align-with-text">
1718
<md-button aria-label="menu" class="md-fab md-primary">
1819
<md-icon md-svg-src="img/icons/menu.svg"></md-icon>
@@ -55,4 +56,4 @@
5556
</div>
5657
</div>
5758
</md-content>
58-
</div>
59+
</div>

src/components/fabToolbar/fabToolbar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
'</div>',
8080

8181
scope: {
82-
direction: '=?mdDirection',
82+
direction: '@?mdDirection',
8383
isOpen: '=?mdOpen'
8484
},
8585

src/components/fabToolbar/fabToolbar.spec.js

+20
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,26 @@ describe('<md-fab-toolbar> directive', function() {
1414
});
1515
}
1616

17+
it('applies a class for each direction', inject(function() {
18+
build(
19+
'<md-fab-toolbar md-direction="{{direction}}"></md-fab-toolbar>'
20+
);
21+
22+
pageScope.$apply('direction = "left"');
23+
expect(element.hasClass('md-left')).toBe(true);
24+
25+
pageScope.$apply('direction = "right"');
26+
expect(element.hasClass('md-right')).toBe(true);
27+
}));
28+
29+
it('accepts a string for md-direction', inject(function() {
30+
build(
31+
'<md-fab-toolbar md-direction="right"></md-fab-toolbar>'
32+
);
33+
34+
expect(element.hasClass('md-right')).toBe(true);
35+
}));
36+
1737
it('allows programmatic opening through the md-open attribute', inject(function() {
1838
build(
1939
'<md-fab-toolbar md-open="isOpen"></md-fab-toolbar>'

0 commit comments

Comments
 (0)