javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

tabs fix

Browse Source
This commit is contained in:
Adam Bradley
2015-07-21 11:50:45 -05:00
parent 3a79a8af14
commit f5844ad802
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ionic/components/action-menu/action-menu.ts
View File

@ -15,20 +15,25 @@ import * as util from 'ionic/util';
@View({ @View({
template: ` template: '' +
<div class="action-menu-backdrop" (click)="_cancel()" tappable></div> '<div class="action-menu-backdrop" (click)="_cancel()" tappable></div>' +
<div class="action-menu-wrapper"> '<div class="action-menu-wrapper">' +
<div class="action-menu-container"> '<div class="action-menu-container">' +
<div class="action-menu-group action-menu-options"> '<div class="action-menu-group action-menu-options">' +
<div class="action-menu-title" *ng-if="titleText">{{titleText}}</div> '<div class="action-menu-title" *ng-if="titleText">{{titleText}}</div>' +
<button (^click)="_buttonClicked(index)" *ng-for="#b of buttons; #index = index" class="action-menu-option"><i class="icon" [class]="b.icon" *ng-if="b.icon"></i> {{b.text}}</button> '<button (^click)="_buttonClicked(index)" *ng-for="#b of buttons; #index = index" class="action-menu-option">' +
<button *ng-if="destructiveText" (click)="_destructive()" class="destructive action-menu-destructive"><i class="icon" [class]="destructiveIcon" *ng-if="destructiveIcon"></i> {{destructiveText}}</button> '<i class="icon" [class]="b.icon" *ng-if="b.icon"></i> ' +
</div> '{{b.text}}' +
<div class="action-menu-group action-menu-cancel" *ng-if="cancelText"> '</button>' +
<button (click)="_cancel()"><i class="icon" [class]="cancelIcon"></i> {{cancelText}}</button> '<button *ng-if="destructiveText" (click)="_destructive()" class="destructive action-menu-destructive">' +
</div> '<i class="icon" [class]="destructiveIcon" *ng-if="destructiveIcon"></i> ' +
</div> '{{destructiveText}}</button>' +
</div>`, '</div>' +
'<div class="action-menu-group action-menu-cancel" *ng-if="cancelText">' +
'<button (click)="_cancel()"><i class="icon" [class]="cancelIcon"></i> {{cancelText}}</button>' +
'</div>' +
'</div>' +
'</div>',
directives: [NgFor, NgIf, CSSClass, TapClick] directives: [NgFor, NgIf, CSSClass, TapClick]
}) })
class ActionMenuDirective { class ActionMenuDirective {

6
ionic/components/tabs/tabs.ts
View File

@ -3,7 +3,7 @@ import {Component, Directive, View, Injector, NgFor, ElementRef, Optional, Paren
import {ViewController} from '../view/view-controller'; import {ViewController} from '../view/view-controller';
import {ViewItem} from '../view/view-item'; import {ViewItem} from '../view/view-item';
import {Icon} from '../icon/icon'; import {Icon} from '../icon/icon';
import {IonicComponent} from '../../config/annotations'; import {IonicComponent, IonicView} from '../../config/annotations';
@IonicComponent({ @IonicComponent({
@ -13,7 +13,7 @@ import {IonicComponent} from '../../config/annotations';
'tabBarIcons': 'top' 'tabBarIcons': 'top'
} }
}) })
@View({ @IonicView({
template: ` template: `
<nav class="tab-bar-container"> <nav class="tab-bar-container">
<div class="tab-bar" role="tablist"> <div class="tab-bar" role="tablist">
@ -27,7 +27,7 @@ import {IonicComponent} from '../../config/annotations';
<content></content> <content></content>
</section> </section>
`, `,
directives: [NgFor, Icon, forwardRef(() => TabButton)] directives: [forwardRef(() => TabButton)]
}) })
export class Tabs extends ViewController { export class Tabs extends ViewController {
constructor( constructor(

12
ionic/components/tabs/test/advanced/index.ts
View File

@ -170,12 +170,12 @@ class Tab2Page3 {
@App({ @App({
routes: { routes: [
'SignIn': { {
'path': '/signin', path: '/signin',
'cls': SignIn, component: SignIn,
'root': true root: true
} }
} ]
}) })
class IonicApp {} class IonicApp {}