diff --git a/demo/src/app/components/+modal/demos/index.ts b/demo/src/app/components/+modal/demos/index.ts index 497b90b705..d8a659c5a7 100644 --- a/demo/src/app/components/+modal/demos/index.ts +++ b/demo/src/app/components/+modal/demos/index.ts @@ -2,12 +2,15 @@ import { DemoModalSizesComponent } from './sizes/sizes'; import { DemoModalStaticComponent } from './static/static'; import { DemoModalChildComponent } from './child/child'; import { DemoAutoShownModalComponent } from './auto-shown/auto-shown'; +import { DemoNestedDropdownsComponent } from '../../+dropdown/demos/nested-dropdowns/nested-dropdowns'; +import { DemoModalNestedComponent } from './nested/nested'; export const DEMO_COMPONENTS = [ DemoModalSizesComponent, DemoModalChildComponent, DemoModalStaticComponent, - DemoAutoShownModalComponent + DemoAutoShownModalComponent, + DemoModalNestedComponent ]; export const DEMOS = { @@ -19,6 +22,10 @@ export const DEMOS = { component: require('!!raw-loader?lang=typescript!./child/child.ts'), html: require('!!raw-loader?lang=markup!./child/child.html') }, + nested: { + component: require('!!raw-loader?lang=typescript!./nested/nested.ts'), + html: require('!!raw-loader?lang=markup!./nested/nested.html') + }, staticModal: { component: require('!!raw-loader?lang=typescript!./static/static.ts'), html: require('!!raw-loader?lang=markup!./static/static.html') diff --git a/demo/src/app/components/+modal/demos/nested/nested.html b/demo/src/app/components/+modal/demos/nested/nested.html new file mode 100644 index 0000000000..fe11a60d05 --- /dev/null +++ b/demo/src/app/components/+modal/demos/nested/nested.html @@ -0,0 +1,50 @@ + + + + + + diff --git a/demo/src/app/components/+modal/demos/nested/nested.ts b/demo/src/app/components/+modal/demos/nested/nested.ts new file mode 100644 index 0000000000..7408e1f465 --- /dev/null +++ b/demo/src/app/components/+modal/demos/nested/nested.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'demo-modal-nested', + templateUrl: './nested.html' +}) +export class DemoModalNestedComponent { + +} diff --git a/demo/src/app/components/+modal/modal-section.component.ts b/demo/src/app/components/+modal/modal-section.component.ts index 27ac4f29ca..9d79abadd9 100644 --- a/demo/src/app/components/+modal/modal-section.component.ts +++ b/demo/src/app/components/+modal/modal-section.component.ts @@ -18,6 +18,7 @@ let titleDoc = require('html-loader!markdown-loader!./docs/title.md');
  • Static modal
  • Optional sizes
  • Child modal
  • +
  • Nested modals
  • Auto shown modal
  • @@ -52,6 +53,12 @@ let titleDoc = require('html-loader!markdown-loader!./docs/title.md'); +

    Nested modals

    +

    Open a modal from another modal

    + + + +

    Auto shown modal

    Show modal right after it has been initialized.