Skip to content

Support collapsed attribute to control. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Support collapsed attribute to control. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4cd7a8
Support collapsed attribute to control.
ulion Jul 19, 2017
6499a6f
Support pass active attribute to the item button.
ulion Jul 19, 2017
6f79521
Adjust to make the active class work.
ulion Jul 19, 2017
9d3eb9f
Use md-icon for the arrow.
ulion Jul 19, 2017
436c06d
Compiled file update.
ulion Jul 19, 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
4 changes: 2 additions & 2 deletions demos/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ <h1 flex>Angular Material Accordion</h1>
<md-accordion-group>
<md-subheader class="md-no-sticky">Caption</md-subheader>

<md-accordion-content md-icon="home" md-heading="Menu 1" md-arrow="true">
<md-accordion-button href="#">Submenu 1</md-accordion-button>
<md-accordion-content md-icon="home" md-heading="Menu 1" md-arrow="true" md-accordion-collapsed="false">
<md-accordion-button href="#" md-active="true">Submenu 1</md-accordion-button>
<md-accordion-button href="#">Submenu 2</md-accordion-button>
<md-accordion-button href="#">Submenu 3</md-accordion-button>
</md-accordion-content>
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-material-accordion.css
View file
Open in desktop

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

62 changes: 32 additions & 30 deletions dist/angular-material-accordion.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/scripts/mdAccordionButton/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ let directive = () => {
ngClick: '@?',
uiSref: '@?',
uiSrefActive: '@?',
active: '<?mdActive',
href: '@?',
target: '@?'
},
Expand Down
1 change: 1 addition & 0 deletions src/scripts/mdAccordionButton/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export default function() {
return `
<md-button
class="md-accordion-button"
ng-class="{'md-active':!!$mdAccordionButton.active}"
layout="column"
ng-attr-href="{{ $mdAccordionButton.href }}"
ng-attr-target="{{ $mdAccordionButton.target }}">
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/mdAccordionContent/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default function() {

this.visible = false;
this.collapsed = angular.isDefined(this.collapsed) ? this.collapsed : true;

this.changeState = function() {
this.visible = !this.visible;
this.collapsed = !this.collapsed;
};

}
3 changes: 2 additions & 1 deletion src/scripts/mdAccordionContent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ let directive = () => {
heading: '@mdHeading',
icon: '@?mdIcon',
svgIcon: '@?mdSvgIcon',
arrow: '@?mdArrow'
arrow: '@?mdArrow',
collapsed: '=?mdAccordionCollapsed'
},
replace: true,
transclude: true,
Expand Down
6 changes: 3 additions & 3 deletions src/scripts/mdAccordionContent/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ export default function() {

return `
<div class="md-accordion-content" layout="column">
<md-button class="md-accordion-toggle" ng-if="$mdAccordionContent.heading" ng-click="$mdAccordionContent.changeState();" ng-class="{ 'md-active': $mdAccordionContent.visible }">
<md-button class="md-accordion-toggle" ng-if="$mdAccordionContent.heading" ng-click="$mdAccordionContent.changeState();" ng-class="{ 'md-active': !$mdAccordionContent.collapsed }">
<div layout="row">
<md-icon ng-if="$mdAccordionContent.svgIcon" md-svg-icon="$mdAccordionContent.svgIcon"></md-icon>
<md-icon ng-if="$mdAccordionContent.icon">{{ $mdAccordionContent.icon }}</md-icon>
<span flex>{{ $mdAccordionContent.heading }}</span>
<i ng-if="$mdAccordionContent.arrow" class="fa fa-chevron-down accordion-arrow" aria-hidden="true"></i>
<md-icon ng-if="$mdAccordionContent.arrow" class="accordion-arrow" aria-hidden="true">keyboard_arrow_down</md-icon>
</div>
</md-button>

<div class="md-accordion-wrapper" md-accordion-disable-animate ng-class="{ 'md-active': $mdAccordionContent.visible, 'md-accordion-wrapper-icons': $mdAccordionContent.icon }" layout="column" ng-transclude></div>
<div class="md-accordion-wrapper" md-accordion-disable-animate ng-class="{ 'md-active': !$mdAccordionContent.collapsed, 'md-accordion-wrapper-icons': $mdAccordionContent.icon }" layout="column" ng-transclude></div>
</div>
`;

Expand Down