javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix menu-toggle style in content

Browse Source
This commit is contained in:
Adam Bradley
2015-12-08 14:20:31 -06:00
parent 6a7f5fadc9
commit 8b0316cbb2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/button/button.ts
View File

@@ -169,7 +169,7 @@ const BUTTON_SIZE_ATTRS = ['large', 'small'];
const BUTTON_STYLE_ATTRS = ['clear', 'outline', 'solid'];
const BUTTON_SHAPE_ATTRS = ['round', 'fab'];
const BUTTON_DISPLAY_ATTRS = ['block', 'full'];
const IGNORE_ATTRS = /_ng|button/;
const IGNORE_ATTRS = /_ng|button|left|right/;
const TEXT = 1;
const ICON = 2;

2
ionic/components/menu/test/basic/page1.html
View File

@@ -21,7 +21,7 @@
</button>
</ion-buttons>
<button menu-toggle="rightMenu" right>
<button menu-toggle="rightMenu" right secondary>
<icon menu></icon>
</button>

8
ionic/components/toolbar/toolbar.ts
View File

@@ -151,19 +151,21 @@ export class ToolbarTitle extends Ion {
@Directive({
selector: 'ion-buttons,[menu-toggle]'
})
export class ToolbarItem extends Ion {
export class ToolbarItem {
constructor(
elementRef: ElementRef,
@Optional() toolbar: Toolbar,
@Optional() @Inject(forwardRef(() => Navbar)) navbar: Navbar
) {
super(elementRef, null);
toolbar && toolbar.addItemRef(elementRef);
navbar && navbar.addItemRef(elementRef);
this.inToolbar = !!(toolbar || navbar);
}
@ContentChildren(Button)
set _buttons(buttons) {
Button.setRoles(buttons, 'bar-button');
if (this.inToolbar) {
Button.setRoles(buttons, 'bar-button');
}
}
}