diff --git a/demos/component-docs/app.scss b/demos/component-docs/app.scss
index 40aebd1efc..f764b7f634 100644
--- a/demos/component-docs/app.scss
+++ b/demos/component-docs/app.scss
@@ -27,6 +27,10 @@ body.has-scrollbar ion-menu scroll-content {
margin-right: 0;
}
+ion-page {
+ display: block;
+}
+
section.hidden {
display: none !important;
}
diff --git a/demos/component-docs/cards/cards-background/main.html b/demos/component-docs/cards/cards-background/main.html
new file mode 100644
index 0000000000..91f0e4e9f4
--- /dev/null
+++ b/demos/component-docs/cards/cards-background/main.html
@@ -0,0 +1,36 @@
+
+
+ Background Images
+
+
+
+
+
+
+
diff --git a/demos/component-docs/cards/cards-background/pages.ts b/demos/component-docs/cards/cards-background/pages.ts
new file mode 100644
index 0000000000..63d8189aba
--- /dev/null
+++ b/demos/component-docs/cards/cards-background/pages.ts
@@ -0,0 +1,13 @@
+import {Page} from 'ionic/ionic';
+import {forwardRef} from 'angular2/angular2';
+import {AndroidAttribute} from '../../helpers';
+
+@Page({
+ templateUrl: 'cards/cards-background/main.html',
+ directives: [forwardRef(() => AndroidAttribute)]
+})
+export class BackgroundPage {
+ constructor() {
+
+ }
+}
\ No newline at end of file
diff --git a/demos/component-docs/cards/cards.ts b/demos/component-docs/cards/cards.ts
index f8d66b3e14..758e3ee1ec 100644
--- a/demos/component-docs/cards/cards.ts
+++ b/demos/component-docs/cards/cards.ts
@@ -2,11 +2,13 @@ import {Page} from 'ionic/ionic';
import {forwardRef} from 'angular2/angular2';
import {AndroidAttribute} from '../helpers';
+export * from './cards-background/pages';
+
@Page({
templateUrl: 'cards/cards-basic.html',
directives: [forwardRef(() => AndroidAttribute)]
})
-export class CardsBasicPage {
+export class BasicPage {
constructor() {
}
@@ -16,7 +18,7 @@ export class CardsBasicPage {
templateUrl: 'cards/cards-header.html',
directives: [forwardRef(() => AndroidAttribute)]
})
-export class CardsHeaderPage {
+export class HeaderPage {
constructor() {
}
@@ -27,7 +29,7 @@ export class CardsHeaderPage {
templateUrl: 'cards/cards-list.html',
directives: [forwardRef(() => AndroidAttribute)]
})
-export class CardsListPage {
+export class ListPage {
constructor() {
}
@@ -37,17 +39,7 @@ export class CardsListPage {
templateUrl: 'cards/cards-image.html',
directives: [forwardRef(() => AndroidAttribute)]
})
-export class CardsImagePage {
- constructor() {
-
- }
-}
-
-@Page({
- templateUrl: 'cards/cards-background.html',
- directives: [forwardRef(() => AndroidAttribute)]
-})
-export class CardsBackgroundPage {
+export class ImagePage {
constructor() {
}
@@ -57,7 +49,7 @@ export class CardsBackgroundPage {
templateUrl: 'cards/cards-advanced-social.html',
directives: [forwardRef(() => AndroidAttribute)]
})
-export class CardsAdvancedSocialPage {
+export class AdvancedSocialPage {
constructor() {
}
@@ -67,7 +59,7 @@ export class CardsAdvancedSocialPage {
templateUrl: 'cards/cards-advanced-map.html',
directives: [forwardRef(() => AndroidAttribute)]
})
-export class CardsAdvancedMapPage {
+export class AdvancedMapPage {
constructor() {
}
@@ -77,7 +69,7 @@ export class CardsAdvancedMapPage {
templateUrl: 'cards/cards-advanced-weather.html',
directives: [forwardRef(() => AndroidAttribute)]
})
-export class CardsAdvancedWeatherPage {
+export class AdvancedWeatherPage {
constructor() {
}
diff --git a/demos/component-docs/helpers.ts b/demos/component-docs/helpers.ts
index 1cea3fc647..36f4ffd672 100644
--- a/demos/component-docs/helpers.ts
+++ b/demos/component-docs/helpers.ts
@@ -15,14 +15,7 @@ import {ButtonsPage,
IconButtonsPage,
ButtonsInComponentsPage} from './buttons/buttons';
-import {CardsBasicPage,
- CardsImagePage,
- CardsHeaderPage,
- CardsListPage,
- CardsBackgroundPage,
- CardsAdvancedMapPage,
- CardsAdvancedSocialPage,
- CardsAdvancedWeatherPage} from './cards/cards';
+import * as cards from './cards/cards';
import {FormsPage,
FixedInlinePage,
@@ -124,15 +117,15 @@ export function getPageFor(hash) {
'button-sizes': ButtonSizesPage,
'icon-buttons': IconButtonsPage,
- 'cards': CardsBasicPage,
- 'card-header': CardsHeaderPage,
- 'card-list': CardsListPage,
- 'card-image': CardsImagePage,
- 'card-background': CardsBackgroundPage,
- 'advanced-cards': CardsAdvancedSocialPage,
- 'card-advanced-map': CardsAdvancedMapPage,
- 'card-advanced-social': CardsAdvancedSocialPage,
- 'card-advanced-weather': CardsAdvancedWeatherPage,
+ 'cards': cards.BasicPage,
+ 'card-header': cards.HeaderPage,
+ 'card-list': cards.ListPage,
+ 'card-image': cards.ImagePage,
+ 'card-background': cards.BackgroundPage,
+ 'advanced-cards': cards.AdvancedSocialPage,
+ 'card-advanced-map': cards.AdvancedMapPage,
+ 'card-advanced-social': cards.AdvancedSocialPage,
+ 'card-advanced-weather': cards.AdvancedWeatherPage,
'checkbox': CheckboxPage,
'radio': RadioPage,
diff --git a/demos/component-docs/index.ts b/demos/component-docs/index.ts
index 2c88b1a67e..38b558645e 100644
--- a/demos/component-docs/index.ts
+++ b/demos/component-docs/index.ts
@@ -14,6 +14,7 @@ class DemoApp {
androidAttribute: any;
constructor(app: IonicApp, platform: Platform) {
+ debugger;
this.app = app;
this.platform = platform;
this.androidAttribute = helpers.AndroidAttribute;
@@ -35,7 +36,7 @@ class DemoApp {
this.nextPage = ActionSheetPage;
}
let nav = this.app.getComponent('nav');
- helpers.debounce(nav.setRoot(this.nextPage), 500, true);
+ nav.setRoot(this.nextPage);
}
});
});
diff --git a/gulpfile.js b/gulpfile.js
index c6d7143412..424342f546 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -59,14 +59,14 @@ function buildDemoBundle(opts, done) {
// pretty sure this is a race, but it works
numWebpacks++;
webpack(config, function(err, stats){
- // var statsOptions = {
- // 'colors': true,
- // 'modules': true,
- // 'chunks': false,
- // 'exclude': ['node_modules'],
- // 'errorDetails': true
- // }
- // console.log(stats.toString(statsOptions));
+ // var statsOptions = {
+ // 'colors': true,
+ // 'modules': true,
+ // 'chunks': false,
+ // 'exclude': ['node_modules'],
+ // 'errorDetails': true
+ // }
+ // console.log(stats.toString(statsOptions));
if (--numWebpacks === 0) done();
})
})