Skip to content

Commit a7e550b

Browse files
committed
Merge branch 'main' of github.com:ionic-team/ionic-docs
# Conflicts: # docs/api/reorder.md # docs/reference/glossary.md
2 parents 02ad5a2 + b4ce82a commit a7e550b

File tree

2,055 files changed

+17550
-4904
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,055 files changed

+17550
-4904
lines changed

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ docs/api
77
docs/native
88
versioned_docs/version-v*/native
99
docs/cli/commands
10+
docs/reference/glossary.md
1011

1112
static/code/stackblitz
1213

_templates/playground/new/angular.md.ejs.t

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
to: "<%= `static/usage/v${version}/${name}/${path}/angular/example_component_html.md` %>"
3+
---
4+
```html
5+
<<%= component %>></<%= component %>>
6+
```
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
---
2-
# this file only gets generated if `angular_ts` (from the command line prompt) is true
3-
to: "<%= angular_ts ? `static/usage/v${version}/${name}/${path}/angular/example_component_ts.md` : null %>"
2+
arbitrary: <% pascalComponent = h.changeCase.pascal(component) %>
3+
to: "<%= `static/usage/v${version}/${name}/${path}/angular/example_component_ts.md` %>"
44
---
55
```ts
66
import { Component } from '@angular/core';
7+
import { <%= pascalComponent %> } from '@ionic/angular/standalone';
78

89
@Component({
910
selector: 'app-example',
1011
templateUrl: 'example.component.html',
11-
<% if (css){ -%>
1212
styleUrls: ['./example.component.css'],
13-
<% } -%>
13+
imports: [<%= pascalComponent %>],
1414
})
15-
export class ExampleComponent {
16-
}
15+
export class ExampleComponent {}
1716
```

_templates/playground/new/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ module.exports = {
6262
name: 'css',
6363
message: 'Generate custom CSS files?',
6464
},
65-
{
66-
type: 'toggle',
67-
name: 'angular_ts',
68-
message: 'Generate an Angular TypeScript file?',
69-
},
7065
])
7166
.then((answers) => {
7267
answers.name = answers.name || answers.component.replace('ion-', '');

_templates/playground/new/index.md.ejs.t

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ import react_main_css from './react/main_css.md';
1212
import react from './react.md';
1313
<% } -%>
1414
import vue from './vue.md';
15-
<% if (css || angular_ts){ %>
15+
1616
import angular_example_component_html from './angular/example_component_html.md';
17-
<% } else { -%>
18-
import angular from './angular.md';
19-
<% } -%>
20-
<% if (angular_ts){ -%>
21-
import angular_example_component_ts from './angular/example_component_ts.md';
22-
<% } -%>
2317
<% if (css){ -%>
2418
import angular_example_component_css from './angular/example_component_css.md';
2519
<% } -%>
20+
import angular_example_component_ts from './angular/example_component_ts.md';
2621

2722
<Playground
2823
version="<%= version %>"
@@ -39,21 +34,15 @@ import angular_example_component_css from './angular/example_component_css.md';
3934
react,
4035
<% } -%>
4136
vue,
42-
<% if (angular_ts || css){ -%>
4337
angular: {
4438
files: {
4539
'src/app/example.component.html': angular_example_component_html,
46-
<% if (angular_ts){ -%>
47-
'src/app/example.component.ts': angular_example_component_ts,
48-
<% } -%>
4940
<% if (css){ -%>
5041
'src/app/example.component.css': angular_example_component_css,
5142
<% } -%>
43+
'src/app/example.component.ts': angular_example_component_ts,
5244
},
5345
},
54-
<% } else { -%>
55-
angular,
56-
<% } -%>
5746
}}
5847
src="usage/v<%= version %>/<%= name %>/<%= path %>/demo.html"
5948
/>

_templates/playground/new/react.md.ejs.t

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ import './main.css';<% } %>
1111

1212
function Example() {
1313
return (
14-
<<%= pascalComponent %>></<%= pascalComponent %>>
14+
<>
15+
<<%= pascalComponent %>></<%= pascalComponent %>>
16+
</>
1517
);
1618
}
1719
export default Example;
1820
```
19-

docs/api/infinite-scroll.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Infinite Scrollコンポーネントは、ユーザーがページの下部ま
2121

2222
ユーザが定義された距離に達したときに、`ionInfinite` イベントに割り当てられた関数が呼び出されます。この関数がすべてのタスクを完了したら、無限スクロールインスタンスに対して `complete()` メソッドを呼び出す必要があります。
2323

24+
## Basic Usage
25+
2426
import Basic from '@site/static/usage/v8/infinite-scroll/basic/index.md';
2527

2628
<Basic />
@@ -118,4 +120,4 @@ interface InfiniteScrollCustomEvent extends CustomEvent {
118120
<CustomProps />
119121

120122
## Slots
121-
<Slots />
123+
<Slots />

docs/api/input-password-toggle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "ion-password-toggle"
2+
title: "ion-input-password-toggle"
33
---
44
import Props from '@ionic-internal/component-api/v8/input-password-toggle/props.md';
55
import Events from '@ionic-internal/component-api/v8/input-password-toggle/events.md';

docs/developing/android.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import DocsCards from '@components/global/DocsCards';
1616

1717
:::info Looking for the legacy Android guide?
1818

19-
The Developing for Android guide has officially migrated to the [Capacitor documentation for Android](https://capacitorjs.com/docs/android). If you need to access the legacy documentation, you can find it under the [legacy developing for Android guide](/docs/v6/developing/android).
19+
The Developing for Android guide has officially migrated to the [Capacitor documentation for Android](https://capacitorjs.com/docs/android). If you need to access the legacy documentation, you can find it under the [legacy developing for Android guide](https://ionic-docs-o31kiyk8l-ionic1.vercel.app/docs/v6/developing/android).
2020

2121
:::
2222

@@ -30,7 +30,7 @@ The Developing for Android guide has officially migrated to the [Capacitor docum
3030
</DocsCard>
3131
<DocsCard
3232
header="Developing for Android with Cordova (Legacy)"
33-
href="/docs/v6/developing/android"
33+
href="https://ionic-docs-o31kiyk8l-ionic1.vercel.app/docs/v6/developing/android"
3434
icon="/icons/native-cordova-bot.png"
3535
>
3636
<p>Learn the fundamentals you need to know to start building Android apps with Ionic Framework and Cordova.</p>

0 commit comments

Comments
 (0)