chore(): update e2e tests

* chore(): update e2e tests

* chore(): back to ion-page

* fix(): generate component def

* chore(): fix missed tests

* fix(): indent

* fix(): indent

* fix(): indent

* fix(): indent

* fix(): add closing icon tag
This commit is contained in:
Mike Hartington
2017-12-11 09:29:53 -08:00
committed by GitHub
parent c30a6629cd
commit ecd0ee33ff
25 changed files with 170 additions and 172 deletions

View File

@ -30,6 +30,7 @@
<ion-button expand="block" id="cssClass" onclick="presentWithCssClass()">Custom CSS Class</ion-button> <ion-button expand="block" id="cssClass" onclick="presentWithCssClass()">Custom CSS Class</ion-button>
</ion-content> </ion-content>
</ion-page> </ion-page>
</ion-app> </ion-app>

View File

@ -46,7 +46,7 @@
<script> <script>
function presentBasic() { async function presentBasic() {
var mode = Ionic.mode; var mode = Ionic.mode;
const actionSheetController = document.querySelector('ion-action-sheet-controller'); const actionSheetController = document.querySelector('ion-action-sheet-controller');

View File

@ -154,7 +154,6 @@ sub {
ion-app, ion-app,
ion-nav, ion-nav,
ion-tabs, ion-tabs,
ion-page,
.ion-page { .ion-page {
@include position(0, null, null, 0); @include position(0, null, null, 0);
@ -170,7 +169,6 @@ ion-page,
// Page Container Structure // Page Container Structure
// -------------------------------------------------- // --------------------------------------------------
ion-page,
.ion-page, .ion-page,
.page-inner { .page-inner {
display: flex; display: flex;

View File

@ -1,11 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html dir="ltr"> <html dir="ltr">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Icon - Basic</title> <title>Icon - Basic</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<script src="/dist/ionic.js"></script> <script src="/dist/ionic.js"></script>
</head> </head>
<body> <body>
<ion-app> <ion-app>
<ion-page> <ion-page>
@ -19,15 +21,31 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col><ion-icon name="logo-ionic" color="primary"></ion-icon></ion-col> <ion-col>
<ion-col><ion-icon name="logo-ionitron" color="primary"></ion-icon></ion-col> <ion-icon name="logo-ionic" color="primary"></ion-icon>
<ion-col><ion-icon name="heart" color="secondary"></ion-icon></ion-col> </ion-col>
<ion-col><ion-icon name="logo-angular" color="danger"></ion-icon></ion-col> <ion-col>
<ion-icon name="logo-ionitron" color="primary"></ion-icon>
</ion-col>
<ion-col>
<ion-icon name="heart" color="secondary"></ion-icon>
</ion-col>
<ion-col>
<ion-icon name="logo-angular" color="danger"></ion-icon>
</ion-col>
<ion-col><ion-icon name="happy"></ion-icon></ion-col> <ion-col>
<ion-col><ion-icon name="people"></ion-icon></ion-col> <ion-icon name="happy"></ion-icon>
<ion-col><ion-icon name="lock"></ion-icon></ion-col> </ion-col>
<ion-col><ion-icon name="key"></ion-icon></ion-col> <ion-col>
<ion-icon name="people"></ion-icon>
</ion-col>
<ion-col>
<ion-icon name="lock"></ion-icon>
</ion-col>
<ion-col>
<ion-icon name="key"></ion-icon>
</ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
@ -62,5 +80,5 @@
</style> </style>
</ion-app> </ion-app>
</body> </body>
</html>
</html>

View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html dir="ltr"> <html dir="ltr">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Icon - Items</title> <title>Icon - Items</title>
@ -11,6 +12,7 @@
} }
</style> </style>
</head> </head>
<body> <body>
<ion-app> <ion-app>
@ -167,4 +169,5 @@
</ion-page> </ion-page>
</ion-app> </ion-app>
</body> </body>
</html> </html>

View File

@ -10,7 +10,7 @@
<body> <body>
<ion-app> <ion-app>
<ion-page main> <ion-page>
<ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>

View File

@ -14,6 +14,7 @@
<ion-title>Input - Basic</ion-title> <ion-title>Input - Basic</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-list> <ion-list>
<ion-item> <ion-item>

View File

@ -55,7 +55,7 @@
</ion-content> </ion-content>
</ion-menu> </ion-menu>
<ion-page main class="show-page"> <ion-page main>
<ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>

View File

@ -5,6 +5,14 @@ import { Component } from '@stencil/core';
tag: 'ion-page', tag: 'ion-page',
}) })
export class Page { export class Page {
hostData() {
return {
class: {
'ion-page': true
}
};
}
render() { render() {
return <slot></slot>; return <slot></slot>;
} }

View File

@ -10,7 +10,7 @@
<body> <body>
<ion-app> <ion-app>
<ion-page class="ion-page"> <ion-page>
<ion-header> <ion-header>
<ion-toolbar color="primary"> <ion-toolbar color="primary">
<ion-buttons slot="start"> <ion-buttons slot="start">

View File

@ -14,6 +14,7 @@
<ion-title>Radio - Basic</ion-title> <ion-title>Radio - Basic</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content class="radio-test outer-content"> <ion-content class="radio-test outer-content">
<ion-list> <ion-list>
<ion-radio-group id="fruitRadio"> <ion-radio-group id="fruitRadio">

View File

@ -16,6 +16,7 @@
<ion-title>Range - Basic</ion-title> <ion-title>Range - Basic</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-list> <ion-list>
<ion-list-header> <ion-list-header>

View File

@ -46,17 +46,23 @@
<ion-item> <ion-item>
Item 5 (custom ion-reorder) Item 5 (custom ion-reorder)
<ion-reorder slot="end"><ion-icon name="pizza"></ion-reorder> <ion-reorder slot="end">
<ion-icon name="pizza"></ion-icon>
</ion-reorder>
</ion-item> </ion-item>
<ion-item> <ion-item>
Item 6 (custom ion-reorder) Item 6 (custom ion-reorder)
<ion-reorder slot="end"><ion-icon name="pizza"></ion-reorder> <ion-reorder slot="end">
<ion-icon name="pizza"></ion-icon>
</ion-reorder>
</ion-item> </ion-item>
<ion-item> <ion-item>
Item 7 (custom ion-reorder slot="start") Item 7 (custom ion-reorder slot="start")
<ion-reorder slot="start"><ion-icon name="pizza"></ion-reorder> <ion-reorder slot="start">
<ion-icon name="pizza"></ion-icon>
</ion-reorder>
</ion-item> </ion-item>
<ion-reorder class="no-hide"> <ion-reorder class="no-hide">

View File

@ -1,14 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html dir="ltr"> <html dir="ltr">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Searchbar - Basic</title> <title>Searchbar - 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"> <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> <script src="/dist/ionic.js"></script>
</head> </head>
<body> <body>
<ion-app> <ion-app>
<ion-page class="ion-page"> <ion-page>
<ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>
<ion-title>Searchbar - Basic</ion-title> <ion-title>Searchbar - Basic</ion-title>
@ -17,90 +19,43 @@
<ion-content> <ion-content>
<h5 padding-left padding-top> Search - Default </h5> <h5 padding-left padding-top> Search - Default </h5>
<ion-searchbar <ion-searchbar value="test" type="tel" show-cancel-button debounce="500">
value="test"
type="tel"
show-cancel-button
debounce="500">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - Animated </h5> <h5 padding-left padding-top> Search - Animated </h5>
<ion-searchbar <ion-searchbar animated="true" show-cancel-button debounce="500">
animated="true"
show-cancel-button
debounce="500">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - Custom Placeholder </h5> <h5 padding-left padding-top> Search - Custom Placeholder </h5>
<ion-searchbar <ion-searchbar id="dynamicProp" value="33" autocorrect="on" show-cancel-button="true" autocomplete="on" spellcheck="false" type="number" placeholder="Filter Schedules">
id="dynamicProp"
value="33"
autocorrect="on"
show-cancel-button="true"
autocomplete="on"
spellcheck="false"
type="number"
placeholder="Filter Schedules">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - No Cancel Button </h5> <h5 padding-left padding-top> Search - No Cancel Button </h5>
<ion-searchbar <ion-searchbar value="after view" autocorrect="off" autocomplete="off" spellcheck="true" type="text" show-cancel-button="false">
value="after view"
autocorrect="off"
autocomplete="off"
spellcheck="true"
type="text"
show-cancel-button="false">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - Custom Cancel Button Danger </h5> <h5 padding-left padding-top> Search - Custom Cancel Button Danger </h5>
<ion-searchbar <ion-searchbar show-cancel-button cancel-button-text="Really Long Cancel" color="danger">
show-cancel-button
cancel-button-text="Really Long Cancel"
color="danger">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - Value passed </h5> <h5 padding-left padding-top> Search - Value passed </h5>
<ion-searchbar <ion-searchbar value="mysearch" cancel-button-text="Really Long Cancel" color="dark" show-cancel-button>
value="mysearch"
cancel-button-text="Really Long Cancel"
color="dark"
show-cancel-button>
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - Mode iOS</h5> <h5 padding-left padding-top> Search - Mode iOS</h5>
<ion-searchbar <ion-searchbar mode="ios" animated="true" show-cancel-button placeholder="Search">
mode="ios"
animated="true"
show-cancel-button
placeholder="Search">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - Mode MD</h5> <h5 padding-left padding-top> Search - Mode MD</h5>
<ion-searchbar <ion-searchbar mode="md" animated="true" show-cancel-button placeholder="Search">
mode="md"
animated="true"
show-cancel-button
placeholder="Search">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - DebounceTime </h5> <h5 padding-left padding-top> Search - DebounceTime </h5>
<ion-searchbar <ion-searchbar autocorrect="on" show-cancel-button="true" autocomplete="on" spellcheck="true" type="text" debounce="5000" placeholder="Check the log">
autocorrect="on"
show-cancel-button="true"
autocomplete="on"
spellcheck="true"
type="text"
debounce="5000"
placeholder="Check the log">
</ion-searchbar> </ion-searchbar>
<h5 padding-left padding-top> Search - Animated and No Cancel</h5> <h5 padding-left padding-top> Search - Animated and No Cancel</h5>
<ion-searchbar <ion-searchbar id="dynamicAttr" placeholder="Search" animated="true" show-cancel-button="false">
id="dynamicAttr"
placeholder="Search"
animated="true"
show-cancel-button="false">
</ion-searchbar> </ion-searchbar>
<p padding> <p padding>
@ -159,4 +114,5 @@
</ion-page> </ion-page>
</ion-app> </ion-app>
</body> </body>
</html> </html>

View File

@ -1,11 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html dir="ltr"> <html dir="ltr">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Segment - Basic</title> <title>Segment - Basic</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<script src="/dist/ionic.js"></script> <script src="/dist/ionic.js"></script>
</head> </head>
<body> <body>
<ion-app> <ion-app>
<ion-page> <ion-page>
@ -114,4 +116,5 @@
</ion-page> </ion-page>
</ion-app> </ion-app>
</body> </body>
</html> </html>

View File

@ -14,6 +14,7 @@
<ion-title>Input - Textarea</ion-title> <ion-title>Input - Textarea</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-list> <ion-list>

View File

@ -70,7 +70,7 @@ export class Toast {
@Prop() position: string; @Prop() position: string;
@Prop() translucent: boolean = false; @Prop() translucent: boolean = false;
@Prop() toastId: string; @Prop() toastId: string;
@Prop() animate: boolean; @Prop() animate: boolean = true;
@Prop() enterAnimation: AnimationBuilder; @Prop() enterAnimation: AnimationBuilder;
@Prop() leaveAnimation: AnimationBuilder; @Prop() leaveAnimation: AnimationBuilder;
@ -87,7 +87,7 @@ export class Toast {
const animationBuilder = this.enterAnimation || this.config.get('toastEnter', this.mode === 'ios' ? iosEnterAnimation : mdEnterAnimation); const animationBuilder = this.enterAnimation || this.config.get('toastEnter', this.mode === 'ios' ? iosEnterAnimation : mdEnterAnimation);
// build the animation and kick it off // build the animation and kick it off
return this.animationCtrl.create(animationBuilder, this.el).then(animation => { return this.animationCtrl.create(animationBuilder, this.el, this.position).then(animation => {
this.animation = animation; this.animation = animation;
if (!this.animate) { if (!this.animate) {
// if the duration is 0, it won't actually animate I don't think // if the duration is 0, it won't actually animate I don't think
@ -115,7 +115,7 @@ export class Toast {
const animationBuilder = this.leaveAnimation || this.config.get('toastLeave', this.mode === 'ios' ? iosLeaveAnimation : mdLeaveAnimation); const animationBuilder = this.leaveAnimation || this.config.get('toastLeave', this.mode === 'ios' ? iosLeaveAnimation : mdLeaveAnimation);
return this.animationCtrl.create(animationBuilder, this.el).then(animation => { return this.animationCtrl.create(animationBuilder, this.el, this.position).then(animation => {
this.animation = animation; this.animation = animation;
return playAnimationAsync(animation); return playAnimationAsync(animation);
}).then((animation) => { }).then((animation) => {

View File

@ -14,6 +14,7 @@
<ion-title>Toggle - Basic</ion-title> <ion-title>Toggle - Basic</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-list> <ion-list>