javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): update dependencies

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-04-22 20:08:02 +02:00
parent 3f8fcda366
commit ae0541a465
48 changed files with 1304 additions and 1725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/components/tabs/tabs.tsx
View File

@ -1,6 +1,7 @@
import { Build, Component, Element, Event, EventEmitter, Listen, Method, Prop, State } from '@stencil/core';
import { Config, NavOutlet } from '../../index';
import { RouteID, RouteWrite, RouterDirection } from '../router/utils/interfaces';
import { TabbarLayout, TabbarPlacement } from '../tabbar/tabbar';
@Component({
@ -42,12 +43,12 @@ export class Tabs implements NavOutlet {
/**
* Set the tabbar layout: `icon-top`, `icon-start`, `icon-end`, `icon-bottom`, `icon-hide`, `title-hide`.
*/
@Prop({ mutable: true }) tabbarLayout?: string;
@Prop({ mutable: true }) tabbarLayout?: TabbarLayout;
/**
* Set position of the tabbar: `top`, `bottom`.
*/
@Prop({ mutable: true }) tabbarPlacement?: string;
@Prop({ mutable: true }) tabbarPlacement?: TabbarPlacement;
/**
* If true, show the tab highlight bar under the selected tab.
@ -78,9 +79,9 @@ export class Tabs implements NavOutlet {
this.useRouter = !!this.doc.querySelector('ion-router') && !this.el.closest('[no-router]');
}
this.loadConfig('tabsPlacement', 'bottom');
this.loadConfig('tabsLayout', 'icon-top');
this.loadConfig('tabsHighlight', true);
this.loadConfig('tabbarLayout', 'bottom');
this.loadConfig('tabbarLayout', 'icon-top');
this.loadConfig('tabbarHighlight', false);
}
async componentDidLoad() {
@ -272,7 +273,7 @@ export class Tabs implements NavOutlet {
render() {
const dom = [
<div class='tabs-inner'>
<div class="tabs-inner">
<slot></slot>
</div>
];

34
core/src/components/tabs/test/placements/e2e.js Normal file
View File

@ -0,0 +1,34 @@
// 'use strict';
// const { register, Page, platforms } = require('../../../../../scripts/e2e');
// const { getElement, waitAndGetElementById, waitForTransition } = require('../../../../../scripts/e2e/utils');
// class E2ETestPage extends Page {
// constructor(driver, platform) {
// super(driver, `http://localhost:3333/src/components/tabs/test/basic?ionicplatform=${platform}`);
// }
// }
// platforms.forEach(platform => {
// describe('tabs/basic', () => {
// register('should init', driver => {
// const page = new E2ETestPage(driver, platform);
// return page.navigate();
// });
// register('should check each tab', async (driver, testContext) => {
// testContext.timeout(60000);
// const page = new E2ETestPage(driver, platform);
// await waitForTransition(300);
// const tabTwoButton = await waitAndGetElementById(driver, 'tab-t-0-1');
// tabTwoButton.click();
// await waitForTransition(600);
// const tabThreeButton = await waitAndGetElementById(driver, 'tab-t-0-2');
// tabThreeButton.click();
// await waitForTransition(600);
// });
// });
// });

56
core/src/components/tabs/test/placements/index.html Normal file
View File

@ -0,0 +1,56 @@
<!DOCTYPE html>
<html dir="ltr">
<head>
<meta charset="UTF-8">
<title>Tab - Basic</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
<script src="/dist/ionic.js"></script>
</head>
<body>
<ion-app>
<ion-tabs tabbar-placement="top">
<ion-tab icon="star">
<ion-header>
<ion-toolbar>
<ion-title>Tab One</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding>
Tab One
</ion-content>
</ion-tab>
<ion-tab icon="globe">
<ion-header>
<ion-toolbar>
<ion-title>Tab Two</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding>
Tab Two
</ion-content>
</ion-tab>
<ion-tab icon="logo-facebook">
<ion-header>
<ion-toolbar>
<ion-title>Tab Three</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding>
Tab Three
</ion-content>
</ion-tab>
<ion-tab disabled icon="chatboxes" component="page-one"></ion-tab>
</ion-tabs>
</ion-app>
</body>
</html>

11
core/src/components/tabs/test/placements/readme.md Normal file
View File

@ -0,0 +1,11 @@
# page-tab
<!-- Auto Generated Below -->
----------------------------------------------
*Built by [StencilJS](https://stenciljs.com/)*

16
core/src/components/tabs/test/translucent/translucent-page-tab.tsx
View File

@ -45,14 +45,14 @@ export class TranslucentPageTab {
<ion-content fullscreen={true}>
<ion-grid>
<ion-row>
<ion-col col-6><f class='red'></f></ion-col>
<ion-col col-6><f class='green'></f></ion-col>
<ion-col col-6><f class='blue'></f></ion-col>
<ion-col col-6><f class='yellow'></f></ion-col>
<ion-col col-6><f class='pink'></f></ion-col>
<ion-col col-6><f class='purple'></f></ion-col>
<ion-col col-6><f class='black'></f></ion-col>
<ion-col col-6><f class='orange'></f></ion-col>
<ion-col col-6><f class="red"></f></ion-col>
<ion-col col-6><f class="green"></f></ion-col>
<ion-col col-6><f class="blue"></f></ion-col>
<ion-col col-6><f class="yellow"></f></ion-col>
<ion-col col-6><f class="pink"></f></ion-col>
<ion-col col-6><f class="purple"></f></ion-col>
<ion-col col-6><f class="black"></f></ion-col>
<ion-col col-6><f class="orange"></f></ion-col>
</ion-row>
</ion-grid>
</ion-content>