chore(demos): change dgeni path for demos

change dgeni path for demos

.github/CONTRIBUTING.md

@@ -97,7 +97,7 @@ Looking for an issue to fix? Make sure to look through our issues with the [help
     *
     * ...
     *
-    * @demo /docs/v2/demos/badge/
+    * @demo /docs/v2/demos/src/badge/
   **/
   ```
 3. Run `gulp watch.demos` to watch for changes to the demo

scripts/gulp/tasks/demos.ts

@@ -131,6 +131,8 @@ function cleanDemos(done: Function) {
     `${DEMOS_ROOT}/css`,
     `${DEMOS_ROOT}/fonts`,
     `${DEMOS_ROOT}/polyfills`,
+    `!${DEMOS_SRC_ROOT}/scrollbar-fix.css`,
+    `!${DEMOS_SRC_ROOT}/scrollbar-fix.js`,
     ], done);
 }
 

scripts/gulp/tasks/docs.ts

@@ -9,7 +9,7 @@ import * as mkdirp from 'mkdirp';
 import { valid }from 'semver';
 import { argv } from 'yargs';
 
-import { DEMOS_ROOT, DEMOS_SRC_ROOT } from '../constants';
+import { DEMOS_ROOT } from '../constants';
 
 
 task('docs', () => {
@@ -29,7 +29,7 @@ task('docs', () => {
   }
 });
 
-task('docs.copyDemos', [], (done: Function) => {
+task('docs.copyDemos', ['demos.build'], (done: Function) => {
   const config = require('../../config.json');
   const outputDir = join(config.docsDest, 'demos');
   let promises = [];
@@ -73,7 +73,7 @@ function copyDemoPolyfills(outputDir: string) {
 
 function copyDemoContent(outputDir: string) {
   return new Promise((resolve, reject) => {
-    const stream = src([`${DEMOS_ROOT}/src/**/main.html`, `${DEMOS_ROOT}/src/**/main.bundle.js`, `${DEMOS_ROOT}/src/scrollbar-fix.*`]).pipe(dest(outputDir));
+    const stream = src([`${DEMOS_ROOT}/src/**/index.html`, `${DEMOS_ROOT}/src/**/main.bundle.js`, `${DEMOS_ROOT}/src/scrollbar-fix.*`]).pipe(dest(outputDir));
     stream.on('end', () => {
       resolve();
     });

src/components/action-sheet/action-sheet.ts

@@ -219,7 +219,7 @@ export class ActionSheet extends ViewController {
  * out before starting a new transition.
  *
  *
- * @demo /docs/v2/demos/action-sheet/
+ * @demo /docs/v2/demos/src/action-sheet/
  * @see {@link /docs/v2/components#action-sheets ActionSheet Component Docs}
  */
 @Injectable()

src/components/alert/alert.ts

@@ -306,7 +306,7 @@ export class Alert extends ViewController {
  * out before starting a new transition.
  *
  *
- * @demo /docs/v2/demos/alert/
+ * @demo /docs/v2/demos/src/alert/
  */
 @Injectable()
 export class AlertController {

src/components/button/button.ts

@@ -86,7 +86,7 @@ import { isTrueProperty } from '../../util/util';
   *  <button ion-button small>Small</button>
   * ```
   *
-  * @demo /docs/v2/demos/button/
+  * @demo /docs/v2/demos/src/button/
   * @see {@link /docs/v2/components#buttons Button Component Docs}
  */
 @Component({

src/components/checkbox/checkbox.ts

@@ -48,7 +48,7 @@ export const CHECKBOX_VALUE_ACCESSOR: any = {
  *  </ion-list>
  * ```
  *
- * @demo /docs/v2/demos/checkbox/
+ * @demo /docs/v2/demos/src/checkbox/
  * @see {@link /docs/v2/components#checkbox Checkbox Component Docs}
  */
 @Component({

src/components/chip/chip.ts

@@ -88,7 +88,7 @@ import { Ion } from '../ion';
   * }
   * ```
   *
-  * @demo /docs/v2/demos/chip/
+  * @demo /docs/v2/demos/src/chip/
  **/
 @Directive({
   selector: 'ion-chip'

src/components/datetime/datetime.ts

@@ -246,7 +246,7 @@ export const DATETIME_VALUE_ACCESSOR: any = {
  * ```
  *
  *
- * @demo /docs/v2/demos/datetime/
+ * @demo /docs/v2/demos/src/datetime/
  */
 @Component({
   selector: 'ion-datetime',

src/components/icon/icon.ts

@@ -31,7 +31,7 @@ import { Ion } from '../ion';
  * <ion-icon name="logo-twitter"></ion-icon>
  * ```
  *
- * @demo /docs/v2/demos/icon/
+ * @demo /docs/v2/demos/src/icon/
  * @see {@link /docs/v2/components#icons Icon Component Docs}
  *
  */

src/components/infinite-scroll/infinite-scroll.ts

@@ -88,7 +88,7 @@ import { Content } from '../content/content';
  * developers to create their own infinite scroll content components.
  * You could replace our default content with custom SVG or CSS animations.
  *
- * @demo /docs/v2/demos/infinite-scroll/
+ * @demo /docs/v2/demos/src/infinite-scroll/
  *
  */
 @Directive({

src/components/input/input.ts

@@ -70,7 +70,7 @@ import { Platform } from '../../platform/platform';
  * </ion-list>
  * ```
  *
- * @demo /docs/v2/demos/input/
+ * @demo /docs/v2/demos/src/input/
  */
 @Component({
   selector: 'ion-input',
@@ -278,7 +278,7 @@ export class TextInput extends InputBase {
  *  </ion-item>
  * ```
  *
- * @demo /docs/v2/demos/textarea/
+ * @demo /docs/v2/demos/src/textarea/
  */
 @Component({
   selector: 'ion-textarea',

src/components/item/item-reorder.ts

@@ -119,7 +119,7 @@ export interface ReorderIndexes {
  * }
  * ```
  *
- * @demo /docs/v2/demos/item-reorder/
+ * @demo /docs/v2/demos/src/item-reorder/
  * @see {@link /docs/v2/components#lists List Component Docs}
  * @see {@link ../../list/List List API Docs}
  * @see {@link ../Item Item API Docs}

src/components/item/item-sliding.ts

@@ -163,7 +163,7 @@ export const enum SlidingState {
  * ```
  *
  *
- * @demo /docs/v2/demos/item-sliding/
+ * @demo /docs/v2/demos/src/item-sliding/
  * @see {@link /docs/v2/components#lists List Component Docs}
  * @see {@link ../Item Item API Docs}
  * @see {@link ../../list/List List API Docs}

src/components/item/item.ts

@@ -265,7 +265,7 @@ import { Label } from '../label/label';
  * ```
  *
  *
- * @demo /docs/v2/demos/item/
+ * @demo /docs/v2/demos/src/item/
  * @see {@link /docs/v2/components#lists List Component Docs}
  * @see {@link ../../list/List List API Docs}
  * @see {@link ../ItemSliding ItemSliding API Docs}

src/components/label/label.ts

@@ -48,7 +48,7 @@ import { Ion } from '../ion';
  *  </ion-item>
  * ```
  *
- * @demo /docs/v2/demos/label/
+ * @demo /docs/v2/demos/src/label/
  * @see {@link ../../../../components#inputs Input Component Docs}
  * @see {@link ../../input/Input Input API Docs}
  *

src/components/list/list.ts

@@ -18,7 +18,7 @@ import { GestureController } from '../../gestures/gesture-controller';
  * interaction modes such as swipe to edit, drag to reorder, and
  * removing items.
  *
- * @demo /docs/v2/demos/list/
+ * @demo /docs/v2/demos/src/list/
  * @see {@link /docs/v2/components#lists List Component Docs}
  * @advanced
  *

src/components/loading/loading.ts

@@ -172,7 +172,7 @@ export class Loading extends ViewController {
  * | dismissOnPageChange   |`boolean`   | Whether to dismiss the indicator when navigating to a new page. Default false.                                   |
  * | duration              |`number`    | How many milliseconds to wait before hiding the indicator. By default, it will show until `dismiss()` is called. |
  *
- * @demo /docs/v2/demos/loading/
+ * @demo /docs/v2/demos/src/loading/
  * @see {@link /docs/v2/api/components/spinner/Spinner Spinner API Docs}
  */
 @Injectable()

src/components/menu/menu-close.ts

@@ -23,7 +23,7 @@ import { MenuController } from './menu-controller';
  * <button ion-button menuClose="left">Close Left Menu</button>
  * ```
  *
- * @demo /docs/v2/demos/menu/
+ * @demo /docs/v2/demos/src/menu/
  * @see {@link /docs/v2/components#menus Menu Component Docs}
  * @see {@link ../../menu/Menu Menu API Docs}
  */

src/components/menu/menu-controller.ts

@@ -109,7 +109,7 @@ import { Platform } from '../../platform/platform';
  * Note: if an app only has one menu, there is no reason to pass an `id`.
  *
  *
- * @demo /docs/v2/demos/menu/
+ * @demo /docs/v2/demos/src/menu/
  *
  * @see {@link /docs/v2/components#menus Menu Component Docs}
  * @see {@link ../Menu Menu API Docs}

src/components/menu/menu-toggle.ts

@@ -79,7 +79,7 @@ import { ViewController } from '../../navigation/view-controller';
  * See the [Toolbar API docs](../../toolbar/Toolbar) for more information
  * on the different positions.
  *
- * @demo /docs/v2/demos/menu/
+ * @demo /docs/v2/demos/src/menu/
  * @see {@link /docs/v2/components#menus Menu Component Docs}
  * @see {@link ../../menu/Menu Menu API Docs}
  */

src/components/menu/menu.ts

@@ -167,7 +167,7 @@ import { GestureController } from '../../gestures/gesture-controller';
  * and usage information.
  *
  *
- * @demo /docs/v2/demos/menu/
+ * @demo /docs/v2/demos/src/menu/
  *
  * @see {@link /docs/v2/components#menus Menu Component Docs}
  * @see {@link ../MenuController MenuController API Docs}

src/components/modal/modal.ts

@@ -158,7 +158,7 @@ export class Modal extends ViewController {
  *
  * }
  * ```
- * @demo /docs/v2/demos/modal/
+ * @demo /docs/v2/demos/src/modal/
  * @see {@link /docs/v2/components#modals Modal Component Docs}
  */
 @Injectable()

src/components/nav/nav-pop.ts

@@ -21,7 +21,7 @@ import { ViewController } from '../../navigation/view-controller';
  * ```
  *
  * Similar to {@link /docs/v2/api/components/nav/NavPush/ `NavPush` }
- * @demo /docs/v2/demos/navigation/
+ * @demo /docs/v2/demos/src/navigation/
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  * @see {@link ../NavPush NavPush API Docs}
  */

src/components/nav/nav-push.ts

@@ -39,7 +39,7 @@ import { NavController } from '../../navigation/nav-controller';
  * }
  * ```
  *
- * @demo /docs/v2/demos/navigation/
+ * @demo /docs/v2/demos/src/navigation/
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  * @see {@link ../NavPop NavPop API Docs}
  *

src/components/nav/nav.ts

@@ -40,7 +40,7 @@ import { ViewController } from '../../navigation/view-controller';
  * }
  * ```
  *
- * @demo /docs/v2/demos/navigation/
+ * @demo /docs/v2/demos/src/navigation/
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  */
 @Component({

src/components/navbar/navbar.ts

@@ -41,7 +41,7 @@ import { ViewController } from '../../navigation/view-controller';
  * </ion-header>
  * ```
  *
- * @demo /docs/v2/demos/navbar/
+ * @demo /docs/v2/demos/src/navbar/
  * @see {@link ../../toolbar/Toolbar/ Toolbar API Docs}
  */
 @Component({

src/components/option/option.ts

@@ -7,7 +7,7 @@ import { isPresent, isTrueProperty } from '../../util/util';
  * @description
  * `ion-option` is a child component of `ion-select`. Similar to the native option element, `ion-option` can take a value and a selected property.
  *
- * @demo /docs/v2/demos/select/
+ * @demo /docs/v2/demos/src/select/
  */
 @Directive({
   selector: 'ion-option'

src/components/popover/popover.ts

@@ -151,7 +151,7 @@ export class Popover extends ViewController {
  *
  *
  *
- * @demo /docs/v2/demos/popover/
+ * @demo /docs/v2/demos/src/popover/
  */
 @Injectable()
 export class PopoverController {

src/components/radio/radio-button.ts

@@ -39,7 +39,7 @@ import { RadioGroup } from './radio-group';
  *   </ion-item>
  * </ion-list>
  * ```
- * @demo /docs/v2/demos/radio/
+ * @demo /docs/v2/demos/src/radio/
  * @see {@link /docs/v2/components#radio Radio Component Docs}
  * @see {@link ../RadioGroup RadioGroup API Docs}
  */

src/components/radio/radio-group.ts

@@ -58,7 +58,7 @@ export const RADIO_VALUE_ACCESSOR: any = {
  * </ion-list>
  * ```
  *
- * @demo /docs/v2/demos/radio/
+ * @demo /docs/v2/demos/src/radio/
  * @see {@link /docs/v2/components#radio Radio Component Docs}
  * @see {@link ../RadioButton RadioButton API Docs}
 */

src/components/range/range.ts

@@ -174,7 +174,7 @@ export class RangeKnob implements OnInit {
  * ```
  *
  *
- * @demo /docs/v2/demos/range/
+ * @demo /docs/v2/demos/src/range/
  */
 @Component({
   selector: 'ion-range',

src/components/refresher/refresher.ts

@@ -84,7 +84,7 @@ import { PointerEvents, UIEventManager } from '../../util/ui-event-manager';
  * components. You could replace our default content with
  * custom SVG or CSS animations.
  *
- * @demo /docs/v2/demos/refresher/
+ * @demo /docs/v2/demos/src/refresher/
  *
  */
 @Directive({

src/components/scroll/scroll.ts

@@ -21,7 +21,7 @@ import { isTrueProperty } from '../../util/util';
  * @property {boolean} [scrollY] - whether to enable scrolling along the Y axis; requires the following CSS declaration: ion-scroll { white-space: nowrap; }
  * @property {boolean} [zoom] - whether to enable zooming
  * @property {number} [maxZoom] - set the max zoom amount for ion-scroll
- * @demo /docs/v2/demos/scroll/
+ * @demo /docs/v2/demos/src/scroll/
  */
 @Component({
   selector: 'ion-scroll',

src/components/searchbar/searchbar.ts

@@ -23,7 +23,7 @@ import { Debouncer } from '../../util/debouncer';
  * </ion-searchbar>
  * ```
  *
- * @demo /docs/v2/demos/searchbar/
+ * @demo /docs/v2/demos/src/searchbar/
  * @see {@link /docs/v2/components#searchbar Searchbar Component Docs}
  */
 @Component({

src/components/segment/segment.ts

@@ -38,7 +38,7 @@ import { isPresent, isTrueProperty } from '../../util/util';
  * ```
  *
  *
- * @demo /docs/v2/demos/segment/
+ * @demo /docs/v2/demos/src/segment/
  * @see {@link /docs/v2/components#segment Segment Component Docs}
  * @see {@link /docs/v2/api/components/segment/Segment/ Segment API Docs}
  */
@@ -171,7 +171,7 @@ export class SegmentButton {
  * ```
  *
  *
- * @demo /docs/v2/demos/segment/
+ * @demo /docs/v2/demos/src/segment/
  * @see {@link /docs/v2/components#segment Segment Component Docs}
  * @see [Angular 2 Forms](http://learnangular2.com/forms/)
  */

src/components/select/select.ts

@@ -118,7 +118,7 @@ export const SELECT_VALUE_ACCESSOR: any = {
  * };
  * ```
  *
- * @demo /docs/v2/demos/select/
+ * @demo /docs/v2/demos/src/select/
  */
 @Component({
   selector: 'ion-select',

src/components/show-hide-when/show-hide-when.ts

@@ -92,7 +92,7 @@ export class DisplayWhen {
  *  I am visible on Landscape!
  * </div>
  * ```
- * @demo /docs/v2/demos/show-when/
+ * @demo /docs/v2/demos/src/show-when/
  * @see {@link ../HideWhen HideWhen API Docs}
  * @see {@link ../../../platform/Platform Platform API Docs}
  */
@@ -151,7 +151,7 @@ export class ShowWhen extends DisplayWhen {
  * </div>
  * ```
  *
- * @demo /docs/v2/demos/hide-when/
+ * @demo /docs/v2/demos/src/hide-when/
  * @see {@link ../ShowWhen ShowWhen API Docs}
  * @see {@link ../../../platform/Platform Platform API Docs}
 */

src/components/slides/slides.ts

@@ -166,7 +166,7 @@ import { Swiper } from './swiper-widget';
  * For all of the methods you can call on the `Slider` instance, see the
  * [Instance Members](#instance-members).
  *
- * @demo /docs/v2/demos/slides/
+ * @demo /docs/v2/demos/src/slides/
  * @see {@link /docs/v2/components#slides Slides Component Docs}
  *
  * Swiper.js:
@@ -838,7 +838,7 @@ export class Slides extends Ion {
   *
   * See the [Slides API Docs](../Slides) for more usage information.
   *
-  * @demo /docs/v2/demos/slides/
+  * @demo /docs/v2/demos/src/slides/
   * @see {@link /docs/v2/api/components/slides/Slides/ Slides API Docs}
   */
 @Component({

src/components/tabs/tab.ts

@@ -114,7 +114,7 @@ import { ViewController } from '../../navigation/view-controller';
  * ```
  *
  *
- * @demo /docs/v2/demos/tabs/
+ * @demo /docs/v2/demos/src/tabs/
  * @see {@link /docs/v2/components#tabs Tabs Component Docs}
  * @see {@link ../../tabs/Tabs Tabs API Docs}
  * @see {@link ../../nav/Nav Nav API Docs}

src/components/tabs/tabs.ts

@@ -131,7 +131,7 @@ import { ViewController } from '../../navigation/view-controller';
  * }
  *```
  *
- * @demo /docs/v2/demos/tabs/
+ * @demo /docs/v2/demos/src/tabs/
  *
  * @see {@link /docs/v2/components#tabs Tabs Component Docs}
  * @see {@link ../Tab Tab API Docs}

src/components/toast/toast.ts

@@ -139,7 +139,7 @@ export class Toast extends ViewController {
  * | closeButtonText       | `string`  | "Close"         | Text to display in the close button.                                                                          |
  * | dismissOnPageChange   | `boolean` | false           | Whether to dismiss the toast when navigating to a new page.                                                   |
  *
- * @demo /docs/v2/demos/toast/
+ * @demo /docs/v2/demos/src/toast/
  */
 @Injectable()
 export class ToastController {

src/components/toggle/toggle.ts

@@ -49,7 +49,7 @@ export const TOGGLE_VALUE_ACCESSOR: any = {
  *  </ion-list>
  * ```
  *
- * @demo /docs/v2/demos/toggle/
+ * @demo /docs/v2/demos/src/toggle/
  * @see {@link /docs/v2/components#toggle Toggle Component Docs}
  */
 @Component({

src/components/toolbar/toolbar-title.ts

@@ -39,7 +39,7 @@ import { Toolbar } from './toolbar';
  * </ion-header>
  * ```
  *
- * @demo /docs/v2/demos/title/
+ * @demo /docs/v2/demos/src/title/
  */
 @Component({
   selector: 'ion-title',

src/components/toolbar/toolbar.ts

@@ -241,7 +241,7 @@ export class ToolbarBase extends Ion {
  * </ion-footer>
  *  ```
  *
- * @demo /docs/v2/demos/toolbar/
+ * @demo /docs/v2/demos/src/toolbar/
  * @see {@link ../../navbar/Navbar/ Navbar API Docs}
  */
 @Component({

src/config/config.ts

@@ -12,7 +12,7 @@ import { isObject, isDefined, isFunction, isArray } from '../util/util';
 
 /**
  * @name Config
- * @demo /docs/v2/demos/config/
+ * @demo /docs/v2/demos/src/config/
  * @description
  * The Config lets you configure your entire app or specific platforms.
  * You can set the tab placement, icon mode, animations, and more here.

src/navigation/nav-params.ts

@@ -14,7 +14,7 @@
  *  }
  * }
  * ```
- * @demo /docs/v2/demos/nav-params/
+ * @demo /docs/v2/demos/src/nav-params/
  * @see {@link /docs/v2/components#navigation Navigation Component Docs}
  * @see {@link ../NavController/ NavController API Docs}
  * @see {@link ../Nav/ Nav API Docs}

src/platform/platform.ts

@@ -26,7 +26,7 @@ import { ready, windowDimensions, flushDimensionCache } from '../util/dom';
  *   }
  * }
  * ```
- * @demo /docs/v2/demos/platform/
+ * @demo /docs/v2/demos/src/platform/
  */
 export class Platform {
   private _versions: {[name: string]: PlatformVersion} = {};

src/storage/local-storage.ts

@@ -27,7 +27,7 @@ import { StorageEngine } from './storage';
  *  }
  *}
  *```
- * @demo /docs/v2/demos/local-storage/
+ * @demo /docs/v2/demos/src/local-storage/
  * @see {@link /docs/v2/platform/storage/ Storage Platform Docs}
  */
 export class LocalStorage extends StorageEngine {

src/util/events.ts

@@ -27,7 +27,7 @@ import { ScrollView } from '../util/scroll-view';
  * });
  *
  * ```
- * @demo /docs/v2/demos/events/
+ * @demo /docs/v2/demos/src/events/
  */
 export class Events {
   private _channels: Array<any> = [];