diff --git a/zh-cn/application-dev/quick-start/arkts-basic-ui-description.md b/zh-cn/application-dev/quick-start/arkts-basic-ui-description.md
index 5ed4a749095ea3650da3da5b8427f9499b39ffdb..c705d35f5cca6c34cd7d52986153663246946f67 100644
--- a/zh-cn/application-dev/quick-start/arkts-basic-ui-description.md
+++ b/zh-cn/application-dev/quick-start/arkts-basic-ui-description.md
@@ -144,7 +144,7 @@ Text(`count: ${this.count}`)
...
Button('add counter')
- .onClick(this.myClickHandler)
+ .onClick(this.myClickHandler.bind(this))
```
### 子组件配置
diff --git a/zh-cn/application-dev/quick-start/start-with-ets-fa.md b/zh-cn/application-dev/quick-start/start-with-ets-fa.md
index b57284c4d4b4d9c43fb58d345d29adb55c720b1a..c7248ea8c98565038505a58391d26ab9353c7fc9 100644
--- a/zh-cn/application-dev/quick-start/start-with-ets-fa.md
+++ b/zh-cn/application-dev/quick-start/start-with-ets-fa.md
@@ -223,7 +223,7 @@
.height('5%')
// 跳转按钮绑定onClick事件,点击时跳转到第二页
.onClick(() => {
- router.push({ url: 'pages/second' })
+ router.pushUrl({ url: 'pages/second' })
})
}
.width('100%')
diff --git a/zh-cn/application-dev/quick-start/start-with-ets-stage.md b/zh-cn/application-dev/quick-start/start-with-ets-stage.md
index 95e548d8009c18c20328d6afa904883602499e12..344a02a8034ca201db21f7207006c939a8d4bbc6 100644
--- a/zh-cn/application-dev/quick-start/start-with-ets-stage.md
+++ b/zh-cn/application-dev/quick-start/start-with-ets-stage.md
@@ -216,7 +216,7 @@
.height('5%')
// 跳转按钮绑定onClick事件,点击时跳转到第二页
.onClick(() => {
- router.push({ url: 'pages/Second' })
+ router.pushUrl({ url: 'pages/Second' })
})
}
.width('100%')
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-basic-input.md b/zh-cn/application-dev/reference/arkui-js/js-components-basic-input.md
index 4921a3c4eb0446567ae16b27aaa994820fd55542..c8e5ed91e420c356d9d27eedc35af4e709e56c6e 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-basic-input.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-basic-input.md
@@ -125,16 +125,16 @@
```js
// xxx.js
- import prompt from '@system.prompt'
+ import promptAction from '@ohos.promptAction
export default {
change(e){
- prompt.showToast({
+ promptAction.showToast({
message: "value: " + e.value,
duration: 3000,
});
},
enterkeyClick(e){
- prompt.showToast({
+ promptAction.showToast({
message: "enterkey clicked",
duration: 3000,
});
@@ -192,10 +192,10 @@
```js
// xxx.js
- import prompt from '@system.prompt'
+ import promptAction from '@ohos.promptAction'
export default {
checkboxOnChange(e) {
- prompt.showToast({
+ promptAction.showToast({
message:'checked: ' + e.checked,
duration: 3000,
});
@@ -227,11 +227,11 @@
```js
// xxx.js
- import prompt from '@system.prompt'
+ import promptAction from '@ohos.promptAction'
export default {
onRadioChange(inputValue, e) {
if (inputValue === e.value) {
- prompt.showToast({
+ promptAction.showToast({
message: 'The chosen radio is ' + e.value,
duration: 3000,
});
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-basic-menu.md b/zh-cn/application-dev/reference/arkui-js/js-components-basic-menu.md
index 8dbbcf2f8a93578bf1089d6d0da5db34e7aba93f..5438d904caeca0d6133b9deebb20063e683ab4a1 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-basic-menu.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-basic-menu.md
@@ -90,10 +90,10 @@
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
onMenuSelected(e) {
- prompt.showToast({
+ promptAction.showToast({
message: e.value
})
},
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-basic-picker.md b/zh-cn/application-dev/reference/arkui-js/js-components-basic-picker.md
index ae142ab4eef9c42886d9cf1d52b2f12571376f8a..9d1294593daf417e07abfb38e28f91a0cc5c0b46 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-basic-picker.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-basic-picker.md
@@ -223,8 +223,7 @@ select {
```js
// xxx.js
-import router from '@system.router';
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
data: {
@@ -252,63 +251,63 @@ export default {
},
textonchange(e) {
this.textvalue = e.newValue;
- prompt.showToast({
+ promptAction.showToast({
message: "text:" + e.newValue + ",newSelected:" + e.newSelected
})
},
textoncancel(e) {
- prompt.showToast({
+ promptAction.showToast({
message: "text: textoncancel"
})
},
dateonchange(e) {
this.datevalue = e.year + "-" + e.month + "-" + e.day;
- prompt.showToast({
+ promptAction.showToast({
message: "date:" + e.year + "-" + (e.month + 1) + "-" + e.day
})
},
dateoncancel() {
- prompt.showToast({
+ promptAction.showToast({
message: "date: dateoncancel"
})
},
timeonchange(e) {
if (this.containsecond) {
this.timevalue = e.hour + ":" + e.minute + ":" + e.second;
- prompt.showToast({
+ promptAction.showToast({
message: "Time:" + e.hour + ":" + e.minute + ":" + e.second
})
} else {
this.timevalue = e.hour + ":" + e.minute;
- prompt.showToast({
+ promptAction.showToast({
message: "Time:" + e.hour + ":" + e.minute
})
}
},
timeoncancel() {
- prompt.showToast({
+ promptAction.showToast({
message: "timeoncancel"
})
},
datetimeonchange(e) {
this.datetimevalue = e.year + "-" + e.month + "-" + e.day + " " + e.hour + ":" + e.minute;
- prompt.showToast({
+ promptAction.showToast({
message: "Time:" + (e.month + 1) + "-" + e.day + " " + e.hour + ":" + e.minute
})
},
datetimeoncancel() {
- prompt.showToast({
+ promptAction.showToast({
message: "datetimeoncancel"
})
},
multitextonchange(e) {
this.multitextvalue = e.newValue;
- prompt.showToast({
+ promptAction.showToast({
message: "Multi-column text change" + e.newValue
})
},
multitextoncancel() {
- prompt.showToast({
+ promptAction.showToast({
message: "multitextoncancel"
})
},
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-basic-rating.md b/zh-cn/application-dev/reference/arkui-js/js-components-basic-rating.md
index 9b5ca80dad91643db51186e612321f9cae815af3..d094414014cb8822e91f9dfe62881007534d459b 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-basic-rating.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-basic-rating.md
@@ -83,10 +83,10 @@ rating {
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
changeRating(e){
- prompt.showToast({
+ promptAction.showToast({
message: e.rating
});
}
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-basic-switch.md b/zh-cn/application-dev/reference/arkui-js/js-components-basic-switch.md
index 85e5663f4fde1e2bcee5926713ccd087516f0202..91f0976743a49d80a60ef1c8dd67c26a0cbca2f3 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-basic-switch.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-basic-switch.md
@@ -91,29 +91,29 @@
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
data: {
title: 'World'
},
switchChange(e) {
if (e.checked) {
- prompt.showToast({
+ prompActiont.showToast({
message: "打开开关"
});
} else {
- prompt.showToast({
+ promptAction.showToast({
message: "关闭开关"
});
}
},
normalswitchChange(e) {
if (e.checked) {
- prompt.showToast({
+ promptAction.showToast({
message: "switch on"
});
} else {
- prompt.showToast({
+ promptAction.showToast({
message: "switch off"
});
}
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-basic-textarea.md b/zh-cn/application-dev/reference/arkui-js/js-components-basic-textarea.md
index 45956db17b2353172c0175151994d1a8e0bd5d47..2285113317b7fe4573342b950a6b3bfa94a166ec 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-basic-textarea.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-basic-textarea.md
@@ -95,10 +95,10 @@
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
change(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'value: ' + e.text + ', lines: ' + e.lines + ', height: ' + e.height,
duration: 3000,
});
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-canvas-imagedata.md b/zh-cn/application-dev/reference/arkui-js/js-components-canvas-imagedata.md
index 5ef669b46283593485330c7fb41b6bd171cd7406..894a409013ce894e1287baceb83507a8e0e4112d 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-canvas-imagedata.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-canvas-imagedata.md
@@ -26,14 +26,14 @@ ImageData对象可以存储canvas渲染的像素数据。
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
onShow() {
const el =this.$refs.canvas;
const ctx = el.getContext('2d');
ctx.fillRect(0,0,200,200)
var imageData = ctx.createImageData(1,1)
- prompt.showToast({
+ promptAction.showToast({
message:imageData,
duration:5000
})
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-common-methods.md b/zh-cn/application-dev/reference/arkui-js/js-components-common-methods.md
index 9087710e1ac8b5a25fb852c3c17f08b9bf27d111..3d7409df287240e3358c69d842b635dfad2346e1 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-common-methods.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-common-methods.md
@@ -138,7 +138,7 @@ button{
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default{
data:{
animation:'',
@@ -161,19 +161,19 @@ export default{
this.animation = this.$element('idName').animate(frames, options);
// handle finish event
this.animation.onfinish = function(){
- prompt.showToast({
+ promptAction.showToast({
message: "The animation is finished."
});
};
// handle cancel event
this.animation.oncancel = function(){
- prompt.showToast({
+ promptAction.showToast({
message: "The animation is canceled."
});
};
// handle repeat event
this.animation.onrepeat = function(){
- prompt.showToast({
+ promptAction.showToast({
message: "The animation is repeated."
});
};
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md b/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md
index 0921eaa35c63df9e8d52346c054c573921438b6c..b519380b9c126ea0255d94c04ebf90881bbabddb 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md
@@ -257,7 +257,7 @@ Page1有一个不透明盒子,点击盒子会跳转到Page2,当点击Page2
```
- ```css
+ ```js
// xxx.js
import router from '@ohos.router';
export default {
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-container-dialog.md b/zh-cn/application-dev/reference/arkui-js/js-components-container-dialog.md
index 0841767ae2a054395cef5e0567b88ff60124b6e5..8c386bb728b47e656af744e80d1d72b56baa1456 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-container-dialog.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-container-dialog.md
@@ -130,30 +130,30 @@
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
showDialog() {
this.$element('simpledialog').show()
},
cancelDialog() {
- prompt.showToast({
+ promptAction.showToast({
message: 'Dialog cancelled'
})
},
cancelSchedule() {
this.$element('simpledialog').close()
- prompt.showToast({
+ promptAction.showToast({
message: 'Successfully cancelled'
})
},
setSchedule() {
this.$element('simpledialog').close()
- prompt.showToast({
+ promptAction.showToast({
message: 'Successfully confirmed'
})
},
doubleclick(){
- prompt.showToast({
+ promptAction.showToast({
message: 'doubleclick'
})
}
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-container-div.md b/zh-cn/application-dev/reference/arkui-js/js-components-container-div.md
index 47802a8d39e69e77179d7e22df1ea5a2d67a158d..1525f5c29e6112eef50fe60253206e1002fdb4a1 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-container-div.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-container-div.md
@@ -252,29 +252,29 @@
```
```css
- /* xxx.css */
- .container {
+ /* xxx.css */
+ .container {
flex-direction: column;
width: 100%;
height: 100%;
- }
- .content {
+ }
+ .content {
width: 200px;
height: 200px;
background-color: red;
- }
+ }
```
```js
// xxx.js
- import prompt from '@system.prompt';
+ import promptAction from '@ohos.promptAction';
export default {
data:{
left:0,
top:0,
},
dragstart(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'Start to be dragged'
})
},
@@ -283,7 +283,7 @@
this.top = e.globalY;
},
dragend(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'End Drag'
})
}
@@ -320,7 +320,7 @@
```js
// xxx.js
- import prompt from '@system.prompt';
+ import promptAction from '@ohos.promptAction';
export default {
data:{
left:0,
@@ -331,22 +331,22 @@
this.top = e.globalY;
},
dragenter(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'enter'
})
},
dragover(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'over'
})
},
dragleave(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'leave'
})
},
drop(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'drop'
})
}
@@ -384,25 +384,25 @@
```js
// xxx.js
- import prompt from '@system.prompt';
+ import promptAction from '@ohos.promptAction';
export default {
pinchstart(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'pinchstart!!!'
})
},
pinchupdate(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'Two-finger pinch update'
})
},
pinchend(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'Finished with two fingers pinching'
})
},
pinchcancel(e){
- prompt.showToast({
+ promptAction.showToast({
message: 'Finger pinching is interrupted'
})
}
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-container-list-item-group.md b/zh-cn/application-dev/reference/arkui-js/js-components-container-list-item-group.md
index f92a9bd39cdd76364373a5ad2b44e127dab709d8..1fdb3cbdc86883d35884ff080e716f66407c777c 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-container-list-item-group.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-container-list-item-group.md
@@ -123,7 +123,7 @@
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
data: {
direction: 'column',
@@ -157,12 +157,12 @@ export default {
this.$element('mylist').expandGroup()
},
collapse(e) {
- prompt.showToast({
+ promptAction.showToast({
message: 'Close ' + e.groupid
})
},
expand(e) {
- prompt.showToast({
+ promptAction.showToast({
message: 'Open ' + e.groupid
})
}
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-container-popup.md b/zh-cn/application-dev/reference/arkui-js/js-components-container-popup.md
index 2e9d58638dcbc075fcec859de6cfc0fa72ac3d0b..4736454e1b2790d00c0c8056bb1ce8f4fe4c76a7 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-container-popup.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-container-popup.md
@@ -110,10 +110,10 @@
```js
// xxx.js
-import prompt from '@system.prompt'
+import promptAction from '@ohos.promptAction'
export default {
visibilitychange(e) {
- prompt.showToast({
+ promptAction.showToast({
message: 'visibility change visibility: ' + e.visibility,
duration: 3000
});
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-container-refresh.md b/zh-cn/application-dev/reference/arkui-js/js-components-container-refresh.md
index 08011bdf1d4bb1e15445410a74a3b90a1f664f18..24a2bdce9188405a42b4184d37c1932d30499240 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-container-refresh.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-container-refresh.md
@@ -106,7 +106,7 @@
```js
// xxx.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
data: {
list:[],
@@ -120,7 +120,7 @@ export default {
}
},
refresh: function (e) {
- prompt.showToast({
+ promptAction.showToast({
message: '刷新中...'
})
var that = this;
@@ -129,7 +129,7 @@ export default {
that.fresh = false;
var addItem = '更新元素';
that.list.unshift(addItem);
- prompt.showToast({
+ promptAction.showToast({
message: '刷新完成!'
})
}, 2000)
diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-grid-col.md b/zh-cn/application-dev/reference/arkui-js/js-components-grid-col.md
index 639aab73dcb1ebc8484f99377affa6f9b10c5751..71e2d3df5ecccfe112058517f5d0b3c5ca3df0bb 100644
--- a/zh-cn/application-dev/reference/arkui-js/js-components-grid-col.md
+++ b/zh-cn/application-dev/reference/arkui-js/js-components-grid-col.md
@@ -92,11 +92,11 @@ grid-col是栅格布局容器grid-row的子容器组件。
```js
// index.js
-import prompt from '@system.prompt';
+import promptAction from '@ohos.promptAction';
export default {
getCol(e) {
this.$element('mygrid').getColumns(function (result) {
- prompt.showToast({
+ promptAction.showToast({
message: e.target.id + ' result = ' + result,
duration: 3000,
});
@@ -104,7 +104,7 @@ export default {
},
getColWidth(e) {
this.$element('mygrid').getColumnWidth(function (result) {
- prompt.showToast({
+ promptAction.showToast({
message: e.target.id + ' result = ' + result,
duration: 3000,
});
diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-image.md b/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-image.md
index 85cef5202529f9a5fde1ef1ae91390444336fac3..2fa8de9c161133c110e2658460da911ee1b71cd3 100644
--- a/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-image.md
+++ b/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-image.md
@@ -355,6 +355,7 @@ struct ImageExample3 {
```ts
import fileio from '@ohos.fileio'
import context from '@ohos.application.context'
+import fs from '@ohos.file.fs'
@Entry
@Component
@@ -374,7 +375,7 @@ struct LoadImageExample {
.onClick(() => {
this.sandboxPath = this.context.getApplicationContext().filesDir + '/icon.png'
console.log(`读取沙箱图片=========>${this.sandboxPath}`)
- let fd = fileio.openSync(this.sandboxPath, 0o100, 0o666)
+ let fd = fs.openSync(this.sandboxPath, 0o100)
console.log(`create file========>${fd}`)
let srcPath = this.context.bundleCodeDir + '/entry/resources/base/media/icon.png'
console.log('mySrcpath' + srcPath)
diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-show-hide.md b/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-show-hide.md
index 22da939eda01d7ba40d4e80a91baddbc9f6739e1..a84c69fc4393a1065f9678c1193406ebfaa1cc16 100644
--- a/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-show-hide.md
+++ b/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-show-hide.md
@@ -19,7 +19,7 @@
```ts
// xxx.ets
-import prompt from '@ohos.prompt'
+import promptAction from '@ohos.promptAction'
@Entry
@Component
@@ -38,14 +38,14 @@ struct AppearExample {
Text(this.myText).fontSize(26).fontWeight(FontWeight.Bold)
.onAppear(() => {
this.changeAppear = 'Hide Text'
- prompt.showToast({
+ promptAction.showToast({
message: 'The text is shown',
duration: 2000
})
})
.onDisAppear(() => {
this.changeAppear = 'Show Text'
- prompt.showToast({
+ promptAction.showToast({
message: 'The text is hidden',
duration: 2000
})
diff --git a/zh-cn/application-dev/ui/js-framework-resource-restriction.md b/zh-cn/application-dev/ui/js-framework-resource-restriction.md
index 2d43d44e821c3c9dd81cac82dfc1086eb1ce6fb5..3612e0f85c2a7ec9a68057218859cdee28c0e319 100644
--- a/zh-cn/application-dev/ui/js-framework-resource-restriction.md
+++ b/zh-cn/application-dev/ui/js-framework-resource-restriction.md
@@ -37,18 +37,18 @@
## 引用JS模块内resources资源
-在应用开发的hml和js文件中使用$r的语法,可以对JS模块内的resources目录下的json资源进行格式化,获取相应的资源内容。
+在应用开发的hml和js文件中使用$r的语法,可以对JS模块内的resources目录下的json资源进行格式化,获取相应的资源内容,该目录与pages目录同级,具体目录结构请参考[文件组织](js-framework-file.md)。
| 属性 | 类型 | 描述 |
| -------- | -------- | -------- |
-| $r | (key: string) => string | 获取资源限定下具体的资源内容。例如:this.$r('strings.hello')。
参数说明:
- key:定义在资源限定文件中的键值,如strings.hello。 |
+| $r | (key: string) => string | 获取资源限定下具体的资源内容。例如:$r('strings.hello')。
参数说明:
- key:定义在资源限定文件中的键值,如strings.hello。 |
**res-defaults.json示例:**
-```
+```json
{
- strings: {
- hello: 'hello world'
+ "strings": {
+ "hello": "hello world"
}
}
```
@@ -57,7 +57,7 @@
resources/res-dark.json:
-```
+```json
{
"image": {
"clockFace": "common/dark_face.png"
@@ -70,7 +70,7 @@ resources/res-dark.json:
resources/res-defaults.json:
-```
+```json
{
"image": {
"clockFace": "common/face.png"
@@ -81,7 +81,7 @@ resources/res-defaults.json:
}
```
-```
+```html