diff --git a/scripts/config.json b/scripts/config.json index 39892fa678..258cdc966c 100644 --- a/scripts/config.json +++ b/scripts/config.json @@ -1,5 +1,5 @@ { "sitePath": "../ionic-site", - "v2DocsDir": "content/docs/v2", - "docsDest": "../ionic-site/content/docs/v2" + "v2DocsDir": "content/docs", + "docsDest": "../ionic-site/content/docs" } diff --git a/scripts/demos/variables.scss b/scripts/demos/variables.scss index c0f8fe6c14..72910b8cc8 100644 --- a/scripts/demos/variables.scss +++ b/scripts/demos/variables.scss @@ -1,5 +1,5 @@ // Ionic Variables and Theming. For more info, please see: -// http://ionicframework.com/docs/v2/theming/ +// http://ionicframework.com/docs/theming/ // Font path is used to include ionicons, // roboto, and noto sans fonts @@ -13,7 +13,7 @@ $font-path: "../assets/fonts"; // To customize the look and feel of this app, you can override // the Sass variables found in Ionic's source scss files. // To view all the possible Ionic variables, see: -// http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/ +// http://ionicframework.com/docs/theming/overriding-ionic-variables/ // Named Color Variables @@ -65,7 +65,7 @@ $colors: ( // Ionicons // -------------------------------------------------- // The premium icon font for Ionic. For more info, please see: -// http://ionicframework.com/docs/v2/ionicons/ +// http://ionicframework.com/docs/ionicons/ @import "ionic.ionicons"; diff --git a/scripts/docs/processors/index-page.js b/scripts/docs/processors/index-page.js index 8eaf199659..3ecdbe407a 100644 --- a/scripts/docs/processors/index-page.js +++ b/scripts/docs/processors/index-page.js @@ -19,7 +19,7 @@ module.exports = function indexPage(renderDocsProcessor) { id: 'index-page', currentVersion: currentVersion, template: 'api_index.template.html', - outputPath: 'content/docs/v2/' + versionPath + '/api/index.md' + outputPath: 'content/docs/' + versionPath + '/api/index.md' }); } } diff --git a/scripts/docs/processors/jekyll.js b/scripts/docs/processors/jekyll.js index 4d92a0587b..746a786599 100644 --- a/scripts/docs/processors/jekyll.js +++ b/scripts/docs/processors/jekyll.js @@ -17,7 +17,7 @@ module.exports = function jekyll(renderDocsProcessor) { return (textA < textB) ? -1 : (textA > textB) ? 1 : 0; }); docs.forEach(function(doc, i) { - docs[i].URL = doc.outputPath.replace('docs/v2//', 'docs/v2/') + docs[i].URL = doc.outputPath.replace('docs//', 'docs/') .replace('/index.md', '') .replace('//home/ubuntu/ionic/src', '') .replace('//', '/') @@ -35,20 +35,20 @@ module.exports = function jekyll(renderDocsProcessor) { docType: 'api-menu', id: 'api-menu', template: 'api_menu.template.html', - outputPath: 'content/_includes/v2_fluid/api_menu.html' + outputPath: 'content/_includes/fluid/api_menu.html' }); docs.push({ docType: 'api-menu-flat-version', id: 'api-menu-flat-version', template: 'api_menu_flat_version.template.html', - outputPath: 'content/_includes/v2_fluid/api_menu_flat_' + currentVersion + + outputPath: 'content/_includes/fluid/api_menu_flat_' + currentVersion + '.html' }); docs.push({ docType: 'api-version-select', id: 'api-version-select', template: 'api_version_select.template.html', - outputPath: 'content/_includes/v2_fluid/api_version_select.html' + outputPath: 'content/_includes/fluid/api_version_select.html' }); // returning docs will replace docs object in the next process diff --git a/scripts/docs/processors/latest-version.js b/scripts/docs/processors/latest-version.js index 43d39fca2f..0a9b6f5b7e 100644 --- a/scripts/docs/processors/latest-version.js +++ b/scripts/docs/processors/latest-version.js @@ -12,7 +12,7 @@ module.exports = function latestVersion(renderDocsProcessor) { $process: function(docs) { var versionData = renderDocsProcessor.extraData.version; - var docsBase = 'dist/ionic-site/content/docs/v2/'; + var docsBase = 'dist/ionic-site/content/docs/'; var versionDir = path.resolve(docsBase, versionData.latest.name); var latestDir = path.resolve(docsBase, 'api'); diff --git a/scripts/docs/templates/api_index.template.html b/scripts/docs/templates/api_index.template.html index 98b3dc79be..b07427752a 100644 --- a/scripts/docs/templates/api_index.template.html +++ b/scripts/docs/templates/api_index.template.html @@ -1,5 +1,5 @@ --- -layout: "v2_fluid/docs_base" +layout: "fluid/docs_base" version: "<$ version.current.name $>" versionHref: "<$ version.current.href $>" path: "" diff --git a/scripts/docs/templates/api_menu.template.html b/scripts/docs/templates/api_menu.template.html index 9cd013e797..7f77989e5e 100644 --- a/scripts/docs/templates/api_menu.template.html +++ b/scripts/docs/templates/api_menu.template.html @@ -5,10 +5,10 @@ <@ else @> {% elsif page.versionHref == "<$ ver.href $>" %} <@ endif @> - {% include v2_fluid/api_menu_flat_<$ ver.name $>.html %} + {% include fluid/api_menu_flat_<$ ver.name $>.html %} <@ endif @> <@ endfor @> <# make the last case always be to show latest version #> {% else %} - {% include v2_fluid/api_menu_flat_<$ version.latest.name $>.html %} + {% include fluid/api_menu_flat_<$ version.latest.name $>.html %} {% endif %} diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html index c2bd0ce95e..11af69c07c 100644 --- a/scripts/docs/templates/common.template.html +++ b/scripts/docs/templates/common.template.html @@ -1,5 +1,5 @@ --- -layout: "v2_fluid/docs_base" +layout: "fluid/docs_base" version: "<$ version.current.name $>" versionHref: "<$ version.current.href $>" path: "<$ doc.path $>" diff --git a/scripts/e2e/variables.scss b/scripts/e2e/variables.scss index c0f8fe6c14..72910b8cc8 100644 --- a/scripts/e2e/variables.scss +++ b/scripts/e2e/variables.scss @@ -1,5 +1,5 @@ // Ionic Variables and Theming. For more info, please see: -// http://ionicframework.com/docs/v2/theming/ +// http://ionicframework.com/docs/theming/ // Font path is used to include ionicons, // roboto, and noto sans fonts @@ -13,7 +13,7 @@ $font-path: "../assets/fonts"; // To customize the look and feel of this app, you can override // the Sass variables found in Ionic's source scss files. // To view all the possible Ionic variables, see: -// http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/ +// http://ionicframework.com/docs/theming/overriding-ionic-variables/ // Named Color Variables @@ -65,7 +65,7 @@ $colors: ( // Ionicons // -------------------------------------------------- // The premium icon font for Ionic. For more info, please see: -// http://ionicframework.com/docs/v2/ionicons/ +// http://ionicframework.com/docs/ionicons/ @import "ionic.ionicons"; diff --git a/scripts/npm/README.md b/scripts/npm/README.md index 36e6202a03..9af4e470b9 100644 --- a/scripts/npm/README.md +++ b/scripts/npm/README.md @@ -2,7 +2,7 @@ The official npm package for [Ionic](http://ionicframework.com/), complete with pre-built ES5 bundles, TypeScript definitions, Sass files, CommonJS ES5 files, and more. -To get started with Ionic, please read the [Installation Guide](http://ionicframework.com/docs/v2/intro/installation/). +To get started with Ionic, please read the [Installation Guide](http://ionicframework.com/docs/intro/installation/). [Ionic Documentation](http://ionicframework.com/docs/) @@ -22,6 +22,6 @@ Minified and unminified CommonJS and System.register module format bundles, as w ### Installation and More -To use Ionic, we recommend installing and utilizing the [Ionic CLI](http://ionicframework.com/docs/v2/intro/installation/) which will help you create pre-configured Ionic apps. +To use Ionic, we recommend installing and utilizing the [Ionic CLI](http://ionicframework.com/docs/intro/installation/) which will help you create pre-configured Ionic apps. For full instructions on using Ionic, please visit the [Ionic Documentation](http://ionicframework.com/docs/) diff --git a/scripts/templates/page/html.tmpl b/scripts/templates/page/html.tmpl index 8285be65f3..a25d201ce7 100644 --- a/scripts/templates/page/html.tmpl +++ b/scripts/templates/page/html.tmpl @@ -1,7 +1,7 @@ diff --git a/scripts/templates/page/ts.tmpl b/scripts/templates/page/ts.tmpl index debfccecb2..a7ee63c910 100644 --- a/scripts/templates/page/ts.tmpl +++ b/scripts/templates/page/ts.tmpl @@ -4,7 +4,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; /** * Generated class for the $CLASSNAME page. * - * See http://ionicframework.com/docs/v2/components/#navigation for more info + * See http://ionicframework.com/docs/components/#navigation for more info * on Ionic pages and navigation. */ @IonicPage() diff --git a/src/components/action-sheet/action-sheet-controller.ts b/src/components/action-sheet/action-sheet-controller.ts index b5096df99e..bee0b68355 100644 --- a/src/components/action-sheet/action-sheet-controller.ts +++ b/src/components/action-sheet/action-sheet-controller.ts @@ -151,8 +151,8 @@ import { Config } from '../../config/config'; * out before starting a new transition. * * - * @demo /docs/v2/demos/src/action-sheet/ - * @see {@link /docs/v2/components#action-sheets ActionSheet Component Docs} + * @demo /docs/demos/src/action-sheet/ + * @see {@link /docs/components#action-sheets ActionSheet Component Docs} */ @Injectable() export class ActionSheetController { diff --git a/src/components/alert/alert-controller.ts b/src/components/alert/alert-controller.ts index 96d79bac16..2d6b197ca8 100644 --- a/src/components/alert/alert-controller.ts +++ b/src/components/alert/alert-controller.ts @@ -215,7 +215,7 @@ import { Config } from '../../config/config'; * out before starting a new transition. * * - * @demo /docs/v2/demos/src/alert/ + * @demo /docs/demos/src/alert/ */ @Injectable() export class AlertController { diff --git a/src/components/avatar/avatar.ts b/src/components/avatar/avatar.ts index 1f533aad28..53951ddc29 100644 --- a/src/components/avatar/avatar.ts +++ b/src/components/avatar/avatar.ts @@ -6,7 +6,7 @@ import { Directive } from '@angular/core'; * @description * An Avatar is a component that creates a circular image for an item. * Avatar's can be placed on the left or right side of an item with the `item-left` or `item-right` directive. - * @see {@link /docs/v2/components/#avatar-list Avatar Component Docs} + * @see {@link /docs/components/#avatar-list Avatar Component Docs} */ @Directive({ selector: 'ion-avatar' diff --git a/src/components/badge/badge.ts b/src/components/badge/badge.ts index 1c5833b0b8..be7a271b0e 100644 --- a/src/components/badge/badge.ts +++ b/src/components/badge/badge.ts @@ -9,7 +9,7 @@ import { Ion } from '../ion'; * @module ionic * @description * Badges are simple components in Ionic containing numbers or text. You can display a badge to indicate that there is new information associated with the item it is on. - * @see {@link /docs/v2/components/#badges Badges Component Docs} + * @see {@link /docs/components/#badges Badges Component Docs} */ @Directive({ selector: 'ion-badge' diff --git a/src/components/button/button.ts b/src/components/button/button.ts index 165a351d25..115919432c 100644 --- a/src/components/button/button.ts +++ b/src/components/button/button.ts @@ -114,9 +114,9 @@ import { isTrueProperty } from '../../util/util'; * * ``` * - * @demo /docs/v2/demos/src/button/ - * @see {@link /docs/v2/components#buttons Button Component Docs} - * @see {@link /docs/v2/components#fabs FabButton Docs} + * @demo /docs/demos/src/button/ + * @see {@link /docs/components#buttons Button Component Docs} + * @see {@link /docs/components#fabs FabButton Docs} * @see {@link ../../fab/FabButton FabButton API Docs} * @see {@link ../../fab/FabContainer FabContainer API Docs} */ @@ -236,7 +236,7 @@ export class Button extends Ion { /** * @input {string} The mode determines which platform styles to use. * Possible values are: `"ios"`, `"md"`, or `"wp"`. - * For more information, see [Platform Styles](/docs/v2/theming/platform-specific-styles). + * For more information, see [Platform Styles](/docs/theming/platform-specific-styles). */ @Input() set mode(val: string) { @@ -269,7 +269,7 @@ export class Button extends Ion { /** * @input {string} The color to use from your Sass `$colors` map. * Default options are: `"primary"`, `"secondary"`, `"danger"`, `"light"`, and `"dark"`. - * For more information, see [Theming your App](/docs/v2/theming/theming-your-app). + * For more information, see [Theming your App](/docs/theming/theming-your-app). */ @Input() set color(val: string) { diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts index 77afd2b753..b71bb510ed 100644 --- a/src/components/checkbox/checkbox.ts +++ b/src/components/checkbox/checkbox.ts @@ -48,8 +48,8 @@ export const CHECKBOX_VALUE_ACCESSOR: any = { * * ``` * - * @demo /docs/v2/demos/src/checkbox/ - * @see {@link /docs/v2/components#checkbox Checkbox Component Docs} + * @demo /docs/demos/src/checkbox/ + * @see {@link /docs/components#checkbox Checkbox Component Docs} */ @Component({ selector: 'ion-checkbox', diff --git a/src/components/chip/chip.ts b/src/components/chip/chip.ts index e8bdebd5df..617d0d0e9f 100644 --- a/src/components/chip/chip.ts +++ b/src/components/chip/chip.ts @@ -88,7 +88,7 @@ import { Ion } from '../ion'; * } * ``` * - * @demo /docs/v2/demos/src/chip/ + * @demo /docs/demos/src/chip/ **/ @Directive({ selector: 'ion-chip' diff --git a/src/components/datetime/datetime.ts b/src/components/datetime/datetime.ts index 5e6d1358a0..60db48da55 100644 --- a/src/components/datetime/datetime.ts +++ b/src/components/datetime/datetime.ts @@ -252,7 +252,7 @@ export const DATETIME_VALUE_ACCESSOR: any = { * ``` * * - * @demo /docs/v2/demos/src/datetime/ + * @demo /docs/demos/src/datetime/ */ @Component({ selector: 'ion-datetime', diff --git a/src/components/fab/fab-container.ts b/src/components/fab/fab-container.ts index 08b0e1cffc..6d0f11bd87 100644 --- a/src/components/fab/fab-container.ts +++ b/src/components/fab/fab-container.ts @@ -83,8 +83,8 @@ import { FabList } from './fab-list'; * } * ``` * - * @demo /docs/v2/demos/src/fab/ - * @see {@link /docs/v2/components#fabs FAB Component Docs} + * @demo /docs/demos/src/fab/ + * @see {@link /docs/components#fabs FAB Component Docs} */ @Component({ selector: 'ion-fab', diff --git a/src/components/fab/fab-list.ts b/src/components/fab/fab-list.ts index 13cc712f60..f5b9c5bbb1 100644 --- a/src/components/fab/fab-list.ts +++ b/src/components/fab/fab-list.ts @@ -27,8 +27,8 @@ import { FabButton } from './fab'; * ``` * @module ionic * - * @demo /docs/v2/demos/src/fab/ - * @see {@link /docs/v2/components#fab Fab Component Docs} + * @demo /docs/demos/src/fab/ + * @see {@link /docs/components#fab Fab Component Docs} */ @Directive({ selector: 'ion-fab-list', diff --git a/src/components/fab/fab.ts b/src/components/fab/fab.ts index ce77dfa9f8..2e6ba65fce 100755 --- a/src/components/fab/fab.ts +++ b/src/components/fab/fab.ts @@ -45,8 +45,8 @@ import { Ion } from '../ion'; * * ``` * - * @demo /docs/v2/demos/src/fab/ - * @see {@link /docs/v2/components#fabs FAB Component Docs} + * @demo /docs/demos/src/fab/ + * @see {@link /docs/components#fabs FAB Component Docs} */ @Component({ selector: '[ion-fab]', diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts index 4dd1613419..519b22b83a 100644 --- a/src/components/icon/icon.ts +++ b/src/components/icon/icon.ts @@ -32,8 +32,8 @@ import { Ion } from '../ion'; * * ``` * - * @demo /docs/v2/demos/src/icon/ - * @see {@link /docs/v2/components#icons Icon Component Docs} + * @demo /docs/demos/src/icon/ + * @see {@link /docs/components#icons Icon Component Docs} * */ @Directive({ @@ -76,7 +76,7 @@ export class Icon extends Ion { /** * @input {string} Specifies which icon to use. The appropriate icon will be used based on the mode. - * For more information, see [Ionicons](/docs/v2/ionicons/). + * For more information, see [Ionicons](/docs/ionicons/). */ @Input() get name(): string { diff --git a/src/components/img/img.ts b/src/components/img/img.ts index 434ccea7ea..de49093d62 100644 --- a/src/components/img/img.ts +++ b/src/components/img/img.ts @@ -28,7 +28,7 @@ import { Platform } from '../../platform/platform'; * of images within a scrollable area, then `ion-img` would be better suited * for the job. * - * > Note: `ion-img` is only meant to be used inside of [virtual-scroll](/docs/v2/api/components/virtual-scroll/VirtualScroll/) + * > Note: `ion-img` is only meant to be used inside of [virtual-scroll](/docs/api/components/virtual-scroll/VirtualScroll/) * * * ### Lazy Loading diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts index 1479fa8a36..208c90a3a5 100644 --- a/src/components/infinite-scroll/infinite-scroll.ts +++ b/src/components/infinite-scroll/infinite-scroll.ts @@ -135,7 +135,7 @@ import { assert } from '../../util/util'; * 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/src/infinite-scroll/ + * @demo /docs/demos/src/infinite-scroll/ * */ @Directive({ diff --git a/src/components/input/input.ts b/src/components/input/input.ts index 5ec3b82be5..d6bbe6c8a1 100644 --- a/src/components/input/input.ts +++ b/src/components/input/input.ts @@ -79,7 +79,7 @@ import { Platform } from '../../platform/platform'; * * ``` * - * @demo /docs/v2/demos/src/input/ + * @demo /docs/demos/src/input/ */ @Component({ selector: 'ion-input,ion-textarea', @@ -828,7 +828,7 @@ export class TextInput extends Ion implements IonicFormInput { * * ``` * - * @demo /docs/v2/demos/src/textarea/ + * @demo /docs/demos/src/textarea/ */ diff --git a/src/components/ion.ts b/src/components/ion.ts index a1154696ca..a3bb9a102b 100644 --- a/src/components/ion.ts +++ b/src/components/ion.ts @@ -30,7 +30,7 @@ export class Ion { /** * @input {string} The color to use from your Sass `$colors` map. * Default options are: `"primary"`, `"secondary"`, `"danger"`, `"light"`, and `"dark"`. - * For more information, see [Theming your App](/docs/v2/theming/theming-your-app). + * For more information, see [Theming your App](/docs/theming/theming-your-app). */ @Input() set color(val: string) { @@ -43,7 +43,7 @@ export class Ion { /** * @input {string} The mode determines which platform styles to use. * Possible values are: `"ios"`, `"md"`, or `"wp"`. - * For more information, see [Platform Styles](/docs/v2/theming/platform-specific-styles). + * For more information, see [Platform Styles](/docs/theming/platform-specific-styles). */ @Input() set mode(val: string) { diff --git a/src/components/item/item-reorder.ts b/src/components/item/item-reorder.ts index 05cc0c7bb2..20d01a3d1b 100644 --- a/src/components/item/item-reorder.ts +++ b/src/components/item/item-reorder.ts @@ -132,8 +132,8 @@ export class ReorderIndexes { * * ``` * - * @demo /docs/v2/demos/src/item-reorder/ - * @see {@link /docs/v2/components#lists List Component Docs} + * @demo /docs/demos/src/item-reorder/ + * @see {@link /docs/components#lists List Component Docs} * @see {@link ../../list/List List API Docs} * @see {@link ../Item Item API Docs} */ diff --git a/src/components/item/item-sliding.ts b/src/components/item/item-sliding.ts index d9624137b3..7ed21c1062 100644 --- a/src/components/item/item-sliding.ts +++ b/src/components/item/item-sliding.ts @@ -106,8 +106,8 @@ const enum SlidingState { * ``` * * - * @demo /docs/v2/demos/src/item-sliding/ - * @see {@link /docs/v2/components#lists List Component Docs} + * @demo /docs/demos/src/item-sliding/ + * @see {@link /docs/components#lists List Component Docs} * @see {@link ../Item Item API Docs} * @see {@link ../../list/List List API Docs} */ diff --git a/src/components/item/item.ts b/src/components/item/item.ts index ab0969c78d..021c99610f 100644 --- a/src/components/item/item.ts +++ b/src/components/item/item.ts @@ -90,7 +90,7 @@ import { ItemReorder } from './item-reorder'; * This feature is not enabled by default for `md` and `wp` modes, but it can be enabled by setting the * Sass variables `$item-md-detail-push-show` and `$item-wp-detail-push-show`, respectively, to `true`. * It can also be disabled for ios by setting `$item-ios-detail-push-show` to `false`. See the - * [theming documentation](http://ionicframework.com/docs/v2/theming/overriding-ionic-variables/) for + * [theming documentation](http://ionicframework.com/docs/theming/overriding-ionic-variables/) for * more information on overriding Sass variables. * * @@ -266,8 +266,8 @@ import { ItemReorder } from './item-reorder'; * ``` * * - * @demo /docs/v2/demos/src/item/ - * @see {@link /docs/v2/components#lists List Component Docs} + * @demo /docs/demos/src/item/ + * @see {@link /docs/components#lists List Component Docs} * @see {@link ../../list/List List API Docs} * @see {@link ../ItemSliding ItemSliding API Docs} */ diff --git a/src/components/label/label.ts b/src/components/label/label.ts index f45b3bfcaa..78d9ba9d6b 100644 --- a/src/components/label/label.ts +++ b/src/components/label/label.ts @@ -48,7 +48,7 @@ import { Ion } from '../ion'; * * ``` * - * @demo /docs/v2/demos/src/label/ + * @demo /docs/demos/src/label/ * @see {@link ../../../../components#inputs Input Component Docs} * @see {@link ../../input/Input Input API Docs} * diff --git a/src/components/list/list.ts b/src/components/list/list.ts index 2f5a5d27b7..55c619c4aa 100644 --- a/src/components/list/list.ts +++ b/src/components/list/list.ts @@ -20,8 +20,8 @@ import { Platform } from '../../platform/platform'; * interaction modes such as swipe to edit, drag to reorder, and * removing items. * - * @demo /docs/v2/demos/src/list/ - * @see {@link /docs/v2/components#lists List Component Docs} + * @demo /docs/demos/src/list/ + * @see {@link /docs/components#lists List Component Docs} * @advanced * * Enable the sliding items. diff --git a/src/components/loading/loading-controller.ts b/src/components/loading/loading-controller.ts index 3e84eb08a9..7be7d90548 100644 --- a/src/components/loading/loading-controller.ts +++ b/src/components/loading/loading-controller.ts @@ -110,8 +110,8 @@ import { LoadingOptions } from './loading-options'; * | 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/src/loading/ - * @see {@link /docs/v2/api/components/spinner/Spinner Spinner API Docs} + * @demo /docs/demos/src/loading/ + * @see {@link /docs/api/components/spinner/Spinner Spinner API Docs} */ @Injectable() export class LoadingController { diff --git a/src/components/menu/menu-close.ts b/src/components/menu/menu-close.ts index e63b042e37..f11f1cb349 100644 --- a/src/components/menu/menu-close.ts +++ b/src/components/menu/menu-close.ts @@ -23,8 +23,8 @@ import { MenuController } from './menu-controller'; * * ``` * - * @demo /docs/v2/demos/src/menu/ - * @see {@link /docs/v2/components#menus Menu Component Docs} + * @demo /docs/demos/src/menu/ + * @see {@link /docs/components#menus Menu Component Docs} * @see {@link ../../menu/Menu Menu API Docs} */ @Directive({ diff --git a/src/components/menu/menu-controller.ts b/src/components/menu/menu-controller.ts index 8246df8d81..ba35197c22 100644 --- a/src/components/menu/menu-controller.ts +++ b/src/components/menu/menu-controller.ts @@ -110,9 +110,9 @@ import { removeArrayItem, assert } from '../../util/util'; * Note: if an app only has one menu, there is no reason to pass an `id`. * * - * @demo /docs/v2/demos/src/menu/ + * @demo /docs/demos/src/menu/ * - * @see {@link /docs/v2/components#menus Menu Component Docs} + * @see {@link /docs/components#menus Menu Component Docs} * @see {@link ../Menu Menu API Docs} * */ diff --git a/src/components/menu/menu-toggle.ts b/src/components/menu/menu-toggle.ts index f9de56da6a..1254ed29a5 100644 --- a/src/components/menu/menu-toggle.ts +++ b/src/components/menu/menu-toggle.ts @@ -80,8 +80,8 @@ import { ViewController } from '../../navigation/view-controller'; * See the [Toolbar API docs](../../toolbar/Toolbar) for more information * on the different positions. * - * @demo /docs/v2/demos/src/menu/ - * @see {@link /docs/v2/components#menus Menu Component Docs} + * @demo /docs/demos/src/menu/ + * @see {@link /docs/components#menus Menu Component Docs} * @see {@link ../../menu/Menu Menu API Docs} */ @Directive({ diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts index e2cfebe110..3fa16232dd 100644 --- a/src/components/menu/menu.ts +++ b/src/components/menu/menu.ts @@ -173,9 +173,9 @@ import { RootNode } from '../split-pane/split-pane'; * and usage information. * * - * @demo /docs/v2/demos/src/menu/ + * @demo /docs/demos/src/menu/ * - * @see {@link /docs/v2/components#menus Menu Component Docs} + * @see {@link /docs/components#menus Menu Component Docs} * @see {@link ../MenuController MenuController API Docs} * @see {@link ../../nav/Nav Nav API Docs} * @see {@link ../../nav/NavController NavController API Docs} diff --git a/src/components/modal/modal-controller.ts b/src/components/modal/modal-controller.ts index beb2b80ad4..0cdad09968 100644 --- a/src/components/modal/modal-controller.ts +++ b/src/components/modal/modal-controller.ts @@ -12,9 +12,9 @@ import { DeepLinker } from '../../navigation/deep-linker'; * A Modal is a content pane that goes over the user's current page. * Usually it is used for making a choice or editing an item. A modal uses the * `NavController` to - * {@link /docs/v2/api/components/nav/NavController/#present present} + * {@link /docs/api/components/nav/NavController/#present present} * itself in the root nav stack. It is added to the stack similar to how - * {@link /docs/v2/api/components/nav/NavController/#push NavController.push} + * {@link /docs/api/components/nav/NavController/#push NavController.push} * works. * * When a modal (or any other overlay such as an alert or actionsheet) is @@ -111,8 +111,8 @@ import { DeepLinker } from '../../navigation/deep-linker'; * * } * ``` - * @demo /docs/v2/demos/src/modal/ - * @see {@link /docs/v2/components#modals Modal Component Docs} + * @demo /docs/demos/src/modal/ + * @see {@link /docs/components#modals Modal Component Docs} */ @Injectable() export class ModalController { diff --git a/src/components/nav/nav-pop.ts b/src/components/nav/nav-pop.ts index 9bbb1269fb..06ac043514 100644 --- a/src/components/nav/nav-pop.ts +++ b/src/components/nav/nav-pop.ts @@ -18,9 +18,9 @@ import { NavController } from '../../navigation/nav-controller'; * * ``` * - * Similar to {@link /docs/v2/api/components/nav/NavPush/ `NavPush` } - * @demo /docs/v2/demos/src/navigation/ - * @see {@link /docs/v2/components#navigation Navigation Component Docs} + * Similar to {@link /docs/api/components/nav/NavPush/ `NavPush` } + * @demo /docs/demos/src/navigation/ + * @see {@link /docs/components#navigation Navigation Component Docs} * @see {@link ../NavPush NavPush API Docs} */ @Directive({ diff --git a/src/components/nav/nav-push.ts b/src/components/nav/nav-push.ts index b2de8355f5..2f85138486 100644 --- a/src/components/nav/nav-push.ts +++ b/src/components/nav/nav-push.ts @@ -39,8 +39,8 @@ import { Page } from '../../navigation/nav-util'; * } * ``` * - * @demo /docs/v2/demos/src/navigation/ - * @see {@link /docs/v2/components#navigation Navigation Component Docs} + * @demo /docs/demos/src/navigation/ + * @see {@link /docs/components#navigation Navigation Component Docs} * @see {@link ../NavPop NavPop API Docs} * */ diff --git a/src/components/nav/nav.ts b/src/components/nav/nav.ts index 63249fcca6..0eab550668 100644 --- a/src/components/nav/nav.ts +++ b/src/components/nav/nav.ts @@ -44,8 +44,8 @@ import { RootNode } from '../split-pane/split-pane'; * } * ``` * - * @demo /docs/v2/demos/src/navigation/ - * @see {@link /docs/v2/components#navigation Navigation Component Docs} + * @demo /docs/demos/src/navigation/ + * @see {@link /docs/components#navigation Navigation Component Docs} */ @Component({ selector: 'ion-nav', diff --git a/src/components/navbar/navbar.ts b/src/components/navbar/navbar.ts index 165809c404..edc834bd45 100644 --- a/src/components/navbar/navbar.ts +++ b/src/components/navbar/navbar.ts @@ -41,7 +41,7 @@ import { ViewController } from '../../navigation/view-controller'; * * ``` * - * @demo /docs/v2/demos/src/navbar/ + * @demo /docs/demos/src/navbar/ * @see {@link ../../toolbar/Toolbar/ Toolbar API Docs} */ @Component({ diff --git a/src/components/note/note.ts b/src/components/note/note.ts index 6c2c99aa6b..52f13575c4 100644 --- a/src/components/note/note.ts +++ b/src/components/note/note.ts @@ -25,7 +25,7 @@ import { Ion } from '../ion'; * * *``` - * {@link /docs/v2/api/components/api/components/item/item ion-item} + * {@link /docs/api/components/api/components/item/item ion-item} */ @Directive({ selector: 'ion-note' diff --git a/src/components/option/option.ts b/src/components/option/option.ts index 8e589b358c..9f4ce30ac1 100644 --- a/src/components/option/option.ts +++ b/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/src/select/ + * @demo /docs/demos/src/select/ */ @Directive({ selector: 'ion-option' diff --git a/src/components/popover/popover-controller.ts b/src/components/popover/popover-controller.ts index 25204f9708..6119ff7cd0 100644 --- a/src/components/popover/popover-controller.ts +++ b/src/components/popover/popover-controller.ts @@ -105,7 +105,7 @@ import { DeepLinker } from '../../navigation/deep-linker'; * * * - * @demo /docs/v2/demos/src/popover/ + * @demo /docs/demos/src/popover/ */ @Injectable() export class PopoverController { diff --git a/src/components/radio/radio-button.ts b/src/components/radio/radio-button.ts index 8b61a8a491..a4cb35e370 100644 --- a/src/components/radio/radio-button.ts +++ b/src/components/radio/radio-button.ts @@ -39,8 +39,8 @@ import { RadioGroup } from './radio-group'; * * * ``` - * @demo /docs/v2/demos/src/radio/ - * @see {@link /docs/v2/components#radio Radio Component Docs} + * @demo /docs/demos/src/radio/ + * @see {@link /docs/components#radio Radio Component Docs} * @see {@link ../RadioGroup RadioGroup API Docs} */ @Component({ @@ -93,7 +93,7 @@ export class RadioButton extends Ion implements IonicTapInput, OnDestroy, OnInit /** * @input {string} The color to use from your Sass `$colors` map. * Default options are: `"primary"`, `"secondary"`, `"danger"`, `"light"`, and `"dark"`. - * For more information, see [Theming your App](/docs/v2/theming/theming-your-app). + * For more information, see [Theming your App](/docs/theming/theming-your-app). */ @Input() set color(val: string) { diff --git a/src/components/radio/radio-group.ts b/src/components/radio/radio-group.ts index 5554fe1ff3..938b521aae 100644 --- a/src/components/radio/radio-group.ts +++ b/src/components/radio/radio-group.ts @@ -58,8 +58,8 @@ export const RADIO_VALUE_ACCESSOR: any = { * * ``` * - * @demo /docs/v2/demos/src/radio/ - * @see {@link /docs/v2/components#radio Radio Component Docs} + * @demo /docs/demos/src/radio/ + * @see {@link /docs/components#radio Radio Component Docs} * @see {@link ../RadioButton RadioButton API Docs} */ @Directive({ diff --git a/src/components/range/range.ts b/src/components/range/range.ts index b2571097a0..8c695aa3e1 100644 --- a/src/components/range/range.ts +++ b/src/components/range/range.ts @@ -90,7 +90,7 @@ export const RANGE_VALUE_ACCESSOR: any = { * ``` * * - * @demo /docs/v2/demos/src/range/ + * @demo /docs/demos/src/range/ */ @Component({ selector: 'ion-range', diff --git a/src/components/refresher/refresher.ts b/src/components/refresher/refresher.ts index f1f3fd6bbe..d22114311e 100644 --- a/src/components/refresher/refresher.ts +++ b/src/components/refresher/refresher.ts @@ -86,7 +86,7 @@ import { UIEventManager } from '../../gestures/ui-event-manager'; * components. You could replace our default content with * custom SVG or CSS animations. * - * @demo /docs/v2/demos/src/refresher/ + * @demo /docs/demos/src/refresher/ * */ @Directive({ diff --git a/src/components/scroll/scroll.ts b/src/components/scroll/scroll.ts index 3ba5c9ca2a..2150a52857 100644 --- a/src/components/scroll/scroll.ts +++ b/src/components/scroll/scroll.ts @@ -17,7 +17,7 @@ import { isTrueProperty } from '../../util/util'; * * * ``` - * @demo /docs/v2/demos/src/scroll/ + * @demo /docs/demos/src/scroll/ */ @Component({ selector: 'ion-scroll', diff --git a/src/components/searchbar/searchbar.ts b/src/components/searchbar/searchbar.ts index 58fd05f459..7fbd6470b3 100644 --- a/src/components/searchbar/searchbar.ts +++ b/src/components/searchbar/searchbar.ts @@ -24,8 +24,8 @@ import { TimeoutDebouncer } from '../../util/debouncer'; * * ``` * - * @demo /docs/v2/demos/src/searchbar/ - * @see {@link /docs/v2/components#searchbar Searchbar Component Docs} + * @demo /docs/demos/src/searchbar/ + * @see {@link /docs/components#searchbar Searchbar Component Docs} */ @Component({ selector: 'ion-searchbar', diff --git a/src/components/segment/segment-button.ts b/src/components/segment/segment-button.ts index 161bf0b482..c446fef7ff 100644 --- a/src/components/segment/segment-button.ts +++ b/src/components/segment/segment-button.ts @@ -34,9 +34,9 @@ import { isPresent, isTrueProperty } from '../../util/util'; * ``` * * - * @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} + * @demo /docs/demos/src/segment/ + * @see {@link /docs/components#segment Segment Component Docs} + * @see {@link /docs/api/components/segment/Segment/ Segment API Docs} */ @Component({ selector: 'ion-segment-button', diff --git a/src/components/segment/segment.ts b/src/components/segment/segment.ts index 1a90cb6713..8c45894625 100644 --- a/src/components/segment/segment.ts +++ b/src/components/segment/segment.ts @@ -59,8 +59,8 @@ import { SegmentButton } from './segment-button'; * ``` * * - * @demo /docs/v2/demos/src/segment/ - * @see {@link /docs/v2/components#segment Segment Component Docs} + * @demo /docs/demos/src/segment/ + * @see {@link /docs/components#segment Segment Component Docs} * @see [Angular 2 Forms](http://learnangular2.com/forms/) */ @Directive({ diff --git a/src/components/select/select.ts b/src/components/select/select.ts index 0899ab6b74..718e512551 100644 --- a/src/components/select/select.ts +++ b/src/components/select/select.ts @@ -118,7 +118,7 @@ export const SELECT_VALUE_ACCESSOR: any = { * }; * ``` * - * @demo /docs/v2/demos/src/select/ + * @demo /docs/demos/src/select/ */ @Component({ selector: 'ion-select', diff --git a/src/components/show-hide-when/hide-when.ts b/src/components/show-hide-when/hide-when.ts index 527f298c09..e586efe21b 100644 --- a/src/components/show-hide-when/hide-when.ts +++ b/src/components/show-hide-when/hide-when.ts @@ -41,7 +41,7 @@ import { DisplayWhen } from './display-when'; * * ``` * - * @demo /docs/v2/demos/src/hide-when/ + * @demo /docs/demos/src/hide-when/ * @see {@link ../ShowWhen ShowWhen API Docs} * @see {@link ../../../platform/Platform Platform API Docs} */ diff --git a/src/components/show-hide-when/show-when.ts b/src/components/show-hide-when/show-when.ts index 99d047fc3c..1b801cfc18 100644 --- a/src/components/show-hide-when/show-when.ts +++ b/src/components/show-hide-when/show-when.ts @@ -42,7 +42,7 @@ import { Platform } from '../../platform/platform'; * I am visible on Landscape! * * ``` - * @demo /docs/v2/demos/src/show-when/ + * @demo /docs/demos/src/show-when/ * @see {@link ../HideWhen HideWhen API Docs} * @see {@link ../../../platform/Platform Platform API Docs} */ diff --git a/src/components/slides/slide.ts b/src/components/slides/slide.ts index 4cef42401e..e1abd0a126 100644 --- a/src/components/slides/slide.ts +++ b/src/components/slides/slide.ts @@ -11,8 +11,8 @@ import { Slides } from './slides'; * * See the [Slides API Docs](../Slides) for more usage information. * - * @demo /docs/v2/demos/src/slides/ - * @see {@link /docs/v2/api/components/slides/Slides/ Slides API Docs} + * @demo /docs/demos/src/slides/ + * @see {@link /docs/api/components/slides/Slides/ Slides API Docs} */ @Component({ selector: 'ion-slide', diff --git a/src/components/slides/slides.ts b/src/components/slides/slides.ts index d3c810c133..bf5bd92e37 100644 --- a/src/components/slides/slides.ts +++ b/src/components/slides/slides.ts @@ -121,8 +121,8 @@ import { ViewController } from '../../navigation/view-controller'; * To see all of the available options, take a look at the * [source for slides](https://github.com/driftyco/ionic/blob/master/src/components/slides/slides.ts). * - * @demo /docs/v2/demos/src/slides/ - * @see {@link /docs/v2/components#slides Slides Component Docs} + * @demo /docs/demos/src/slides/ + * @see {@link /docs/components#slides Slides Component Docs} * * Adopted from Swiper.js: * The most modern mobile touch slider and framework with diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts index 9ced302386..5c7352cf08 100644 --- a/src/components/tabs/tab.ts +++ b/src/components/tabs/tab.ts @@ -115,8 +115,8 @@ import { ViewController } from '../../navigation/view-controller'; * ``` * * - * @demo /docs/v2/demos/src/tabs/ - * @see {@link /docs/v2/components#tabs Tabs Component Docs} + * @demo /docs/demos/src/tabs/ + * @see {@link /docs/components#tabs Tabs Component Docs} * @see {@link ../../tabs/Tabs Tabs API Docs} * @see {@link ../../nav/Nav Nav API Docs} * @see {@link ../../nav/NavController NavController API Docs} diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index b91a334c60..12b135c21d 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -140,9 +140,9 @@ import { ViewController } from '../../navigation/view-controller'; * this.navCtrl.parent.select(2); * } *``` - * @demo /docs/v2/demos/src/tabs/ + * @demo /docs/demos/src/tabs/ * - * @see {@link /docs/v2/components#tabs Tabs Component Docs} + * @see {@link /docs/components#tabs Tabs Component Docs} * @see {@link ../Tab Tab API Docs} * @see {@link ../../config/Config Config API Docs} * diff --git a/src/components/thumbnail/thumbnail.ts b/src/components/thumbnail/thumbnail.ts index 9c42771f74..01fa502e7a 100644 --- a/src/components/thumbnail/thumbnail.ts +++ b/src/components/thumbnail/thumbnail.ts @@ -6,7 +6,7 @@ import { Directive } from '@angular/core'; * @description * A Thumbnail is a component that creates a squared image for an item. * Thumbnails can be place on the left or right side of an item with the `item-left` or `item-right` directive. - * @see {@link /docs/v2/components/#thumbnail-list Thumbnail Component Docs} + * @see {@link /docs/components/#thumbnail-list Thumbnail Component Docs} */ @Directive({ selector: 'ion-thumbnail' diff --git a/src/components/toast/toast-controller.ts b/src/components/toast/toast-controller.ts index 51ed788f25..ef4ae3dbe3 100644 --- a/src/components/toast/toast-controller.ts +++ b/src/components/toast/toast-controller.ts @@ -66,7 +66,7 @@ import { ToastOptions } from './toast-options'; * | 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/src/toast/ + * @demo /docs/demos/src/toast/ */ @Injectable() export class ToastController { diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts index 9c33d463d1..e2a116b29c 100644 --- a/src/components/toggle/toggle.ts +++ b/src/components/toggle/toggle.ts @@ -54,8 +54,8 @@ export const TOGGLE_VALUE_ACCESSOR: any = { * * ``` * - * @demo /docs/v2/demos/src/toggle/ - * @see {@link /docs/v2/components#toggle Toggle Component Docs} + * @demo /docs/demos/src/toggle/ + * @see {@link /docs/components#toggle Toggle Component Docs} */ @Component({ selector: 'ion-toggle', diff --git a/src/components/toolbar/toolbar-title.ts b/src/components/toolbar/toolbar-title.ts index 4a5b78dfe4..0c3d5aa7fe 100644 --- a/src/components/toolbar/toolbar-title.ts +++ b/src/components/toolbar/toolbar-title.ts @@ -39,7 +39,7 @@ import { Toolbar } from './toolbar'; * * ``` * - * @demo /docs/v2/demos/src/title/ + * @demo /docs/demos/src/title/ */ @Component({ selector: 'ion-title', diff --git a/src/components/toolbar/toolbar.ts b/src/components/toolbar/toolbar.ts index f82b030c2b..a6584002d1 100644 --- a/src/components/toolbar/toolbar.ts +++ b/src/components/toolbar/toolbar.ts @@ -90,7 +90,7 @@ import { ToolbarBase } from './toolbar-base'; * * ``` * - * @demo /docs/v2/demos/src/toolbar/ + * @demo /docs/demos/src/toolbar/ * @see {@link ../../navbar/Navbar/ Navbar API Docs} */ @Component({ diff --git a/src/config/config.ts b/src/config/config.ts index 0a978915de..62ca8329d3 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -12,7 +12,7 @@ import { isObject, isDefined, isFunction, isArray } from '../util/util'; /** * @name Config - * @demo /docs/v2/demos/src/config/ + * @demo /docs/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. diff --git a/src/index.ts b/src/index.ts index 8a7e245c84..fd63d97467 100644 --- a/src/index.ts +++ b/src/index.ts @@ -334,7 +334,7 @@ export { IonicGestureConfig } from './gestures/gesture-config'; * directives, and providers from the framework are imported. * * Any configuration for the app can be passed as the second argument to `forRoot`. This can be any - * valid property from the [Config](/docs/v2/api/config/Config/). + * valid property from the [Config](/docs/api/config/Config/). * * @usage * ```ts diff --git a/src/navigation/nav-controller.ts b/src/navigation/nav-controller.ts index ff0f5cfd01..e5e0674d00 100644 --- a/src/navigation/nav-controller.ts +++ b/src/navigation/nav-controller.ts @@ -346,7 +346,7 @@ import { ViewController } from './view-controller'; * * The property 'animation' understands the following values: `md-transition`, `ios-transition` and `wp-transition`. * - * @see {@link /docs/v2/components#navigation Navigation Component Docs} + * @see {@link /docs/components#navigation Navigation Component Docs} */ export abstract class NavController { diff --git a/src/navigation/nav-params.ts b/src/navigation/nav-params.ts index 5cd6f12c16..588e5bea8c 100644 --- a/src/navigation/nav-params.ts +++ b/src/navigation/nav-params.ts @@ -14,11 +14,11 @@ * } * } * ``` - * @demo /docs/v2/demos/src/nav-params/ - * @see {@link /docs/v2/components#navigation Navigation Component Docs} + * @demo /docs/demos/src/nav-params/ + * @see {@link /docs/components#navigation Navigation Component Docs} * @see {@link ../NavController/ NavController API Docs} - * @see {@link /docs/v2/api/components/nav/Nav/ Nav API Docs} - * @see {@link /docs/v2/api/components/nav/NavPush/ NavPush API Docs} + * @see {@link /docs/api/components/nav/Nav/ Nav API Docs} + * @see {@link /docs/api/components/nav/NavPush/ NavPush API Docs} */ export class NavParams { diff --git a/src/platform/platform.ts b/src/platform/platform.ts index b15a82fd69..cba7e3e293 100644 --- a/src/platform/platform.ts +++ b/src/platform/platform.ts @@ -27,7 +27,7 @@ import { removeArrayItem } from '../util/util'; * } * } * ``` - * @demo /docs/v2/demos/src/platform/ + * @demo /docs/demos/src/platform/ */ export class Platform { private _win: Window; diff --git a/src/util/events.ts b/src/util/events.ts index ce682e0b40..4e76bd465a 100644 --- a/src/util/events.ts +++ b/src/util/events.ts @@ -27,7 +27,7 @@ import { ScrollView } from '../util/scroll-view'; * }); * * ``` - * @demo /docs/v2/demos/src/events/ + * @demo /docs/demos/src/events/ */ export class Events { private _channels: any = [];