diff --git a/src/components/button/button.ts b/src/components/button/button.ts
index 7209436ea6..0b6bd0e7ae 100644
--- a/src/components/button/button.ts
+++ b/src/components/button/button.ts
@@ -89,6 +89,7 @@ export class Button {
*/
@Prop() default: boolean = false;
+ @Prop() disabled: boolean = false;
/**
* @input {boolean} If true, activates a transparent button style with a border.
* Type: style
@@ -228,9 +229,14 @@ export class Button {
return prevValue;
}, {});
+ console.log(this.disabled);
+
return h(this,
h('div', {
- class: buttonClasses
+ class: buttonClasses,
+ props: {
+ disabled: this.disabled
+ }
},
[
h('span', {
diff --git a/src/components/button/test/anchors/app/app.component.ts b/src/components/button/test/anchors/app/app.component.ts
deleted file mode 100644
index a356c9ea9b..0000000000
--- a/src/components/button/test/anchors/app/app.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-import { PageOne } from '../pages/page-one/page-one';
-
-@Component({
- template: ''
-})
-export class AppComponent {
- rootPage = PageOne;
-}
diff --git a/src/components/button/test/anchors/app/app.module.ts b/src/components/button/test/anchors/app/app.module.ts
deleted file mode 100644
index 472cd840ec..0000000000
--- a/src/components/button/test/anchors/app/app.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../../..';
-
-import { AppComponent } from './app.component';
-import { PageOneModule } from '../pages/page-one/page-one.module';
-
-@NgModule({
- declarations: [
- AppComponent
- ],
- imports: [
- BrowserModule,
- IonicModule.forRoot(AppComponent),
- PageOneModule
- ],
- bootstrap: [IonicApp]
-})
-export class AppModule {}
diff --git a/src/components/button/test/anchors/app/main.ts b/src/components/button/test/anchors/app/main.ts
deleted file mode 100644
index 6af7a5b2ae..0000000000
--- a/src/components/button/test/anchors/app/main.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app.module';
-
-platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/components/button/test/anchors/e2e.ts b/src/components/button/test/anchors/e2e.ts
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/components/button/test/anchors/e2e.ts
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/components/button/test/anchors/pages/page-one/page-one.html b/src/components/button/test/anchors/pages/page-one/page-one.html
deleted file mode 100644
index 20aa4b626b..0000000000
--- a/src/components/button/test/anchors/pages/page-one/page-one.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
- Anchor Buttons
-
-
-
-
-
-
-
-
- Default
- Default.activated
-
-
-
- Primary
- Primary.activated
-
-
-
- Secondary
- Secondary.activated
-
-
-
- Danger
- Danger.activated
-
-
-
- Light
- Light.activated
-
-
-
- Dark
- Dark.activated
-
-
-
- A Disabled
- Secondary Disabled
-
-
-
- Change Color
- Change Color
-
-
-
diff --git a/src/components/button/test/anchors/pages/page-one/page-one.module.ts b/src/components/button/test/anchors/pages/page-one/page-one.module.ts
deleted file mode 100644
index 8b48a5850d..0000000000
--- a/src/components/button/test/anchors/pages/page-one/page-one.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { IonicPageModule } from '../../../../../..';
-
-import { PageOne } from './page-one';
-
-@NgModule({
- declarations: [
- PageOne,
- ],
- imports: [
- IonicPageModule.forChild(PageOne),
- ],
- entryComponents: [
- PageOne,
- ]
-})
-export class PageOneModule {}
diff --git a/src/components/button/test/anchors/pages/page-one/page-one.ts b/src/components/button/test/anchors/pages/page-one/page-one.ts
deleted file mode 100644
index 5b20c1059c..0000000000
--- a/src/components/button/test/anchors/pages/page-one/page-one.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Component } from '@angular/core';
-import { App } from '../../../../../..';
-
-@Component({
- templateUrl: 'page-one.html'
-})
-export class PageOne {
- btnColor: string;
- testingColors = ['primary', 'secondary', 'danger', 'dark'];
- testingColorIndex = 0;
-
- constructor(app: App) {
- app.setTitle('Basic Buttons');
- this.chgColor();
- }
-
- chgColor() {
- this.btnColor = this.testingColors[this.testingColorIndex];
- console.log('dynamic btnColor', this.btnColor);
- this.testingColorIndex = (this.testingColorIndex >= this.testingColors.length - 1 ? 0 : this.testingColorIndex + 1);
- }
-}
diff --git a/src/components/button/test/attributes/pages/page-one/page-one.html b/src/components/button/test/attributes/pages/page-one/page-one.html
index 9b31e5c9dd..6dfacc9bf1 100644
--- a/src/components/button/test/attributes/pages/page-one/page-one.html
+++ b/src/components/button/test/attributes/pages/page-one/page-one.html
@@ -2,10 +2,10 @@
-
-
-
-
+ Default
+ Solid
+ Outline
+ Clear
@@ -14,26 +14,26 @@
Button Displays
-
-
-
+ Block (toggle)
+ Full
+ Both
Button Styles (Click to Toggle)
-
-
-
+ Solid
+ Outline
+ Clear
Button Sizes
-
-
-
+ Small
+ Default
+ Large
Button Colors (Click to Toggle)
-
-
-
-
-
+ Block
+ Solid
+ Outline
+ Clear
+ Remove Colors
@@ -41,10 +41,10 @@
-
-
-
-
+ Default
+ Solid
+ Outline
+ Clear
diff --git a/src/components/button/test/attributes/pages/page-one/page-one.module.ts b/src/components/button/test/attributes/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/attributes/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/attributes/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/basic/pages/page-one/page-one.html b/src/components/button/test/basic/pages/page-one/page-one.html
index f8211d938d..d9b0aad26c 100644
--- a/src/components/button/test/basic/pages/page-one/page-one.html
+++ b/src/components/button/test/basic/pages/page-one/page-one.html
@@ -8,45 +8,45 @@
-
+
-
-
+ Button Disabled
+ Secondary Disabled
-
+
diff --git a/src/components/button/test/basic/pages/page-one/page-one.module.ts b/src/components/button/test/basic/pages/page-one/page-one.module.ts
index 0f5e31b5f2..f498de7c5e 100644
--- a/src/components/button/test/basic/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/basic/pages/page-one/page-one.module.ts
@@ -1,5 +1,5 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -13,6 +13,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/block/pages/page-one/page-one.html b/src/components/button/test/block/pages/page-one/page-one.html
index 8e71b845ad..772dce908b 100644
--- a/src/components/button/test/block/pages/page-one/page-one.html
+++ b/src/components/button/test/block/pages/page-one/page-one.html
@@ -11,36 +11,36 @@
a[ion-button][block]
-
+ button[ion-button][block]
a[ion-button][block] icon
-
+ button[ion-button][block] icon
a[ion-button][block][outline][secondary]
-
+ button[ion-button][block][outline][secondary]
a[ion-button][block][clear][dark]
-
+ button[ion-button][clear][block][dark]
a[ion-button][block][round]
-
+ button[ion-button][block][round]
a[ion-button][block][round][outline]
-
+ button[ion-button][block][round][outline]
-
+ Toggle Block
diff --git a/src/components/button/test/block/pages/page-one/page-one.module.ts b/src/components/button/test/block/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/block/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/block/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/clear/pages/page-one/page-one.html b/src/components/button/test/clear/pages/page-one/page-one.html
index ed46bce976..cdbdad2c0e 100644
--- a/src/components/button/test/clear/pages/page-one/page-one.html
+++ b/src/components/button/test/clear/pages/page-one/page-one.html
@@ -10,37 +10,37 @@
-
-
+ Default
+ Default.activated
-
-
+ Primary
+ Primary.activated
-
-
+ Secondary
+ Secondary.activated
-
-
+ Danger
+ Danger.activated
-
-
+ Light
+ Light.activated
-
-
+ Dark
+ Dark.activated
-
+ Toggle Clear
diff --git a/src/components/button/test/clear/pages/page-one/page-one.module.ts b/src/components/button/test/clear/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/clear/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/clear/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/decorator/pages/page-one/page-one.html b/src/components/button/test/decorator/pages/page-one/page-one.html
index 118ac14ec1..f237ec1250 100644
--- a/src/components/button/test/decorator/pages/page-one/page-one.html
+++ b/src/components/button/test/decorator/pages/page-one/page-one.html
@@ -3,9 +3,9 @@
Outline Buttons
-
+
@@ -15,43 +15,43 @@
-
-
+ Default (small)
+ Default (small)
-
-
+ Outline
+ Outline
-
-
+ Block (large)
+ Block (large)
-
-
+ Full
+ Default
-
-
+ Raised
+ Raised
-
-
+ Round
+ Round
-
-
+ Clear
+ Clear
-
-
+ Default
+ Default
diff --git a/src/components/button/test/decorator/pages/page-one/page-one.module.ts b/src/components/button/test/decorator/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/decorator/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/decorator/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/dynamic/pages/page-one/page-one.html b/src/components/button/test/dynamic/pages/page-one/page-one.html
index 35d587a618..d83eab404b 100644
--- a/src/components/button/test/dynamic/pages/page-one/page-one.html
+++ b/src/components/button/test/dynamic/pages/page-one/page-one.html
@@ -2,12 +2,12 @@
-
-
+ ngIf
+ Outline
Default Buttons
-
+ Solid
@@ -16,25 +16,25 @@
-
-
-
-
-
+ Solid
+ Danger (Outline)
+ Secondary (Clear)
+ Custom #1
+ Custom #2 (Outline)
-
-
+ Secondary (Toggle)
+ Danger (Toggle)
-
+ Toggle Header
-
-
-
+
diff --git a/src/components/button/test/dynamic/pages/page-one/page-one.module.ts b/src/components/button/test/dynamic/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/dynamic/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/dynamic/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/full/pages/page-one/page-one.html b/src/components/button/test/full/pages/page-one/page-one.html
index 0fc256fde6..fc141171e7 100644
--- a/src/components/button/test/full/pages/page-one/page-one.html
+++ b/src/components/button/test/full/pages/page-one/page-one.html
@@ -11,7 +11,7 @@
a[ion-button][full]
-
+ button[ion-button][full]
@@ -19,25 +19,25 @@
a[ion-button][full] + icon
-
+
a[ion-button][full][outline][secondary]
-
+ button[ion-button][full][outline][secondary]
a[ion-button][full][clear][light]
-
+ button[ion-button][full][clear][light]
a[ion-button][full][clear][dark]
-
+ button[ion-button][full][clear][dark]
diff --git a/src/components/button/test/full/pages/page-one/page-one.module.ts b/src/components/button/test/full/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/full/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/full/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/icons/pages/page-one/page-one.html b/src/components/button/test/icons/pages/page-one/page-one.html
index 478de32a98..02fa604861 100644
--- a/src/components/button/test/icons/pages/page-one/page-one.html
+++ b/src/components/button/test/icons/pages/page-one/page-one.html
@@ -10,10 +10,10 @@
-
+
diff --git a/src/components/button/test/icons/pages/page-one/page-one.module.ts b/src/components/button/test/icons/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/icons/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/icons/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/outline/pages/page-one/page-one.html b/src/components/button/test/outline/pages/page-one/page-one.html
index 3435e06bbd..30f9d5ca21 100644
--- a/src/components/button/test/outline/pages/page-one/page-one.html
+++ b/src/components/button/test/outline/pages/page-one/page-one.html
@@ -10,53 +10,53 @@
-
-
+ Default
+ Default.activated
-
-
+ Primary
+ Primary.activated
-
-
+ Secondary
+ Secondary.activated
-
-
+ Danger
+ Danger.activated
-
-
+ Light
+ Light.activated
-
-
+ Dark
+ Dark.activated
-
+ button[ion-button][outline][block]
-
+ [outline][block].activated
-
+ button[ion-button][outline][block][secondary]
-
+ [outline][block][secondary].activated
-
+ Toggle Outline
diff --git a/src/components/button/test/outline/pages/page-one/page-one.module.ts b/src/components/button/test/outline/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/outline/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/outline/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/raised/app.module.ts b/src/components/button/test/raised/app.module.ts
index 20982bd470..c624404f00 100644
--- a/src/components/button/test/raised/app.module.ts
+++ b/src/components/button/test/raised/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, NgModule } from '@angular/core';
+import { Component, NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { IonicApp, IonicModule } from '../../../..';
@@ -27,6 +27,9 @@ export class AppComponent {
bootstrap: [IonicApp],
entryComponents: [
E2EPage
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class AppModule {}
diff --git a/src/components/button/test/raised/main.html b/src/components/button/test/raised/main.html
index c55675bbdf..cd4de877d6 100644
--- a/src/components/button/test/raised/main.html
+++ b/src/components/button/test/raised/main.html
@@ -10,32 +10,32 @@
-
-
+ Default
+ Default.activated
-
-
+ Outline
+ Outline.activated
-
-
+ Clear
+ Clear.activated
-
-
+ Round
+ Round.activated
-
-
+ Block
+ Block.activated
-
+ Clear Disabled
diff --git a/src/components/button/test/round/pages/page-one/page-one.html b/src/components/button/test/round/pages/page-one/page-one.html
index 1f426ef0e8..c5d4166d32 100644
--- a/src/components/button/test/round/pages/page-one/page-one.html
+++ b/src/components/button/test/round/pages/page-one/page-one.html
@@ -9,17 +9,17 @@
-
-
-
-
-
+ button
+ button light
+ button secondary
+ button danger
+ button dark
-
-
-
-
-
+ button
+ button light
+ button secondary
+ button danger
+ button dark
diff --git a/src/components/button/test/round/pages/page-one/page-one.module.ts b/src/components/button/test/round/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/round/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/round/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/button/test/sizes/pages/page-one/page-one.html b/src/components/button/test/sizes/pages/page-one/page-one.html
index 040754c000..635818df50 100644
--- a/src/components/button/test/sizes/pages/page-one/page-one.html
+++ b/src/components/button/test/sizes/pages/page-one/page-one.html
@@ -11,26 +11,26 @@
a[ion-button]
-
+ button
a[ion-button][small]
-
+ button[ion-button][small]
a[ion-button][outline][small]
-
+ button[ion-button][outline][small]
a[ion-button][clear][small]
-
+ button[ion-button][clear][small]
-
+ [large]
H
E
@@ -41,12 +41,12 @@
a[ion-button][outline][large]
-
+ button[ion-button][outline][large]
a[clear][large]
-
+ button[ion-button][clear][large]
diff --git a/src/components/button/test/sizes/pages/page-one/page-one.module.ts b/src/components/button/test/sizes/pages/page-one/page-one.module.ts
index 8b48a5850d..ea5c47c577 100644
--- a/src/components/button/test/sizes/pages/page-one/page-one.module.ts
+++ b/src/components/button/test/sizes/pages/page-one/page-one.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { IonicPageModule } from '../../../../../..';
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
],
entryComponents: [
PageOne,
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class PageOneModule {}
diff --git a/src/components/slides/test/control/app.module.ts b/src/components/slides/test/control/app.module.ts
index 70390ecdf7..0af527d10d 100644
--- a/src/components/slides/test/control/app.module.ts
+++ b/src/components/slides/test/control/app.module.ts
@@ -1,4 +1,4 @@
-import { Component, NgModule } from '@angular/core';
+import { Component, NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { IonicApp, IonicModule } from '../../../..';
@@ -30,6 +30,9 @@ export class AppComponent {
entryComponents: [
AppComponent,
MyPage
+ ],
+ schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
]
})
export class AppModule {}