Skip to content

Commit b9782ae

Browse files
committed
Merge branch 'next'
2 parents ab1cd91 + b123b61 commit b9782ae

9 files changed

Lines changed: 122 additions & 107 deletions

docs/chart/features.md

Lines changed: 46 additions & 38 deletions
Large diffs are not rendered by default.

docs/grid/features.md

Lines changed: 62 additions & 61 deletions
Large diffs are not rendered by default.

docs/helpers/icon.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use the name of the icon as a value of the **icon** property in the object with
3030
~~~js {3}
3131
const list = new dhx.List("list_container", {
3232
css: "dhx_widget--bordered",
33-
template: (item) => "<i class=’dxi dxi-icon-’ + item.icon></i>"
33+
template: (item) => "<i class = ’dxi dxi-icon-’ + item.icon></i>"
3434
});
3535
~~~
3636

@@ -43,7 +43,7 @@ const popup = new dhx.Popup({
4343
css: "dhx_widget--border-shadow"
4444
});
4545

46-
popup.attachHTML("<i class=’dxi dxi-icon-name’></i>");
46+
popup.attachHTML("<i class = ’dxi dxi-icon-name’></i>");
4747
~~~
4848

4949
- by adding an HTML element with an icon class in any place of your app
@@ -53,15 +53,15 @@ You can use any inline HTML elements like &lt;i&gt; or &lt;span&gt;.
5353
~~~html
5454
<i class="dxi dxi-icon-name"></i>
5555

56-
<span class="dxi dxi-icon-name"></i>
56+
<span class="dxi dxi-icon-name"></span>
5757
~~~
5858

5959
- via the **HTML** configuration property of the component
6060

6161
~~~js {3}
6262
{
6363
id: "sidebar",
64-
html: "<i class=’dxi dxi-icon-name’></i>",
64+
html: "<i class = ’dxi dxi-icon-name’></i>",
6565
gravity: false,
6666
css: "dhx_layout-cell--border_right",
6767
width: "200px"

docs/layout/api/cell/layout_cell_progresshide_method.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ layout.getCell("two").progressHide();
2121

2222
@descr:
2323

24-
**Related sample**: [Layout. Spinner (busy indicator, progress bar) for cells](https://snippet.dhtmlx.com/vzrvf4rm)
24+
**Related sample**: [Layout. Spinner (busy indicator, progress bar) for Layout and its cells](https://snippet.dhtmlx.com/vzrvf4rm)
2525

2626
**Related article:** [Showing/hiding a progress bar](layout/work_with_layout.md#showinghiding-a-progress-bar)

docs/layout/api/cell/layout_cell_progressshow_method.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ layout.getCell("two").progressShow();
2020

2121
@descr:
2222

23-
**Related sample**: [Layout. Spinner (busy indicator, progress bar) for cells](https://snippet.dhtmlx.com/vzrvf4rm)
23+
**Related sample**: [Layout. Spinner (busy indicator, progress bar) for Layout and its cells](https://snippet.dhtmlx.com/vzrvf4rm)
2424

2525
**Related article:** [Showing/hiding a progress bar](layout/work_with_layout.md#showinghiding-a-progress-bar)

docs/layout/api/layout_progresshide_method.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ layout.progressHide();
1717

1818
@descr:
1919

20+
**Related sample:** [Layout. Spinner (busy indicator/ progress bar) for Layout and its cells](https://snippet.dhtmlx.com/vzrvf4rm)
21+
2022
**Related article:** [Showing/hiding a progress bar](layout/work_with_layout.md#showinghiding-a-progress-bar)

docs/layout/api/layout_progressshow_method.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ layout.progressShow();
2020

2121
@descr:
2222

23+
**Related sample:** [Layout. Spinner (busy indicator/ progress bar) for Layout and its cells](https://snippet.dhtmlx.com/vzrvf4rm)
24+
2325
**Related article:** [Showing/hiding a progress bar](layout/work_with_layout.md#showinghiding-a-progress-bar)

docs/layout/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ In this section you will learn how to get a cell object, how to add or remove, h
8686
| [Showing/hiding a cell](../work_with_layout/#hidingshowing-a-cell) | Learn how to hide/show a cell ([Example 1](https://snippet.dhtmlx.com/v0q7gq26), [Example](https://snippet.dhtmlx.com/u0jd8ah3)) |
8787
| [Checking visibility of a cell](../work_with_layout/#checking-visibility-of-a-cell) | Learn how to check whether a Layout cell is visible |
8888
| [Expanding/collapsing a cell](../work_with_layout/#collapsingexpanding-a-cell) | Learn how to collapse/expand a cell ([Example 1](https://snippet.dhtmlx.com/h0wtlpyk), [Example 2](https://snippet.dhtmlx.com/t38tqk0k)) |
89-
|[Showing/hiding a progress bar](layout/work_with_layout.md#showinghiding-a-progress-bar)|Learn how to show/hide the progress bar in a Layout container or in a cell|
89+
|[Showing/hiding a progress bar](layout/work_with_layout.md#showinghiding-a-progress-bar)|Learn how to show/hide the progress bar in a Layout container or in a cell ([Example](https://snippet.dhtmlx.com/vzrvf4rm))|
9090

9191

9292
## Layout patterns

docs/layout/work_with_layout.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,6 @@ To hide the component, apply the [progressHide()](layout/api/cell/layout_cell_pr
164164

165165
~~~js
166166
layout.getCell("two").progressHide();
167-
~~~
167+
~~~
168+
169+
**Related sample:** [Layout. Spinner (busy indicator/ progress bar) for Layout and its cells](https://snippet.dhtmlx.com/vzrvf4rm)

0 commit comments

Comments
 (0)