Skip to content

Commit 5d7128a

Browse files
committed
Merge branch 'master' into next
2 parents a5e6a51 + 3b1e989 commit 5d7128a

Some content is hidden

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

41 files changed

+161
-83
lines changed

docs/calendar/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ In this section you will learn about common functionality of the library which c
111111

112112
## Any questions left?
113113

114-
<button class="support_btn"><a href="https://snippet.dhtmlx.com/all?tag=calendar">Check more samples >>></a> </button>
114+
<button class="support_btn"><a href="https://snippet.dhtmlx.com/jkbfb202?tag=calendar">Check more samples >>></a> </button>
115115
<br>
116116
<button class="support_btn"><a href="https://forum.dhtmlx.com/c/suite/suite7/">Ask the community >>></a> </button>
117117

docs/chart/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ In this section you will learn about common functionality of the library which c
154154

155155
## Any questions left?
156156

157-
<button class="support_btn"><a href="https://snippet.dhtmlx.com/all?tag=chart">Check more samples >>></a> </button>
157+
<button class="support_btn"><a href="https://snippet.dhtmlx.com/bo82km4n?tag=chart">Check more samples >>></a> </button>
158158
<br>
159159
<button class="support_btn"><a href="https://forum.dhtmlx.com/c/suite/suite7/">Ask the community >>></a> </button>
160160

docs/colorpicker/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ In this section you will learn about common functionality of the library which c
106106

107107
## Any questions left?
108108

109-
<button class="support_btn"><a href="https://snippet.dhtmlx.com/all?tag=colorpicker">Check more samples >>></a> </button>
109+
<button class="support_btn"><a href="https://snippet.dhtmlx.com/097jjhb8?tag=colorpicker">Check more samples >>></a> </button>
110110
<br>
111111
<button class="support_btn"><a href="https://forum.dhtmlx.com/c/suite/suite7/">Ask the community >>></a> </button>
112112

docs/combobox/features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ In this section you will learn about common functionality of the library which c
136136
| ------------------------------------------------------------- | ------------------------------------------------------------- |
137137
| [Touch support](../../common_features/touch_support/) | Learn how to work with touch support |
138138
| [TypeScript support](../../common_features/using_typescript/) | Learn how to work with TypeScript |
139-
| [AwaitRedraw](../../helpers/await_redraw/) | Learn how to perform the code after the components rendering |
139+
| [AwaitRedraw](../../helpers/await_redraw/) | Learn how to perform the code after the component's rendering |
140140

141141
## Any questions left?
142142

143-
<button class="support_btn"><a href="https://snippet.dhtmlx.com/all?tag=combobox">Check more samples >>></a> </button>
143+
<button class="support_btn"><a href="https://snippet.dhtmlx.com/ui7pi7ty?tag=combobox">Check more samples >>></a> </button>
144144
<br>
145145
<button class="support_btn"><a href="https://forum.dhtmlx.com/c/suite/suite7/">Ask the community >>></a> </button>
146146

docs/common_features/custom_scroll.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ From v7.2, DHTMLX includes neat custom scrollbars with a thin grey semi-transpar
1212

1313
<iframe src="https://snippet.dhtmlx.com/gjsbvzdk?mode=result" frameborder="0" class="snippet_iframe" width="100%" height="700"></iframe>
1414

15-
The custom scroll is available for the following DHTMLX components: List, DataView, Grid, TreeGrid, Layout cell, Toolbar, Ribbon, Sidebar, Window.
15+
The custom scroll is available for the following DHTMLX components: List, DataView, Grid, Grid in the TreeGrid mode, Layout cell, Toolbar, Ribbon, Sidebar, Window.
1616

1717
To add the feature into your application, you need to set the **enable** property of the **dhx.scrollViewConfig** global variable to *true* before initialization of the widgets:
1818

docs/data_collection/api/datacollection_sort_method.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ description: You can explore the sort method of DataCollection in the documentat
1111
@signature: {'sort(rule?: object, config?: object): void;'}
1212

1313
@params:
14-
- `rule: object` - an object with parameters for sorting. The parameters are:
14+
- `rule: object` - an object with parameters for sorting. The object has the following attributes:
1515
- `by: string | number` - the id of a data field (a column of Grid)
16-
- `dir: string` - the direction of sorting "asc" or "desc"
16+
- `dir: string` - the direction of sorting: "asc" or "desc"
1717
- `as: function` - a function that specifies the type to sort data as
1818
- `rule: function` - optional, a sorting rule; the function must have two parameters and return a number (-1,0,1)
1919
- `config: object` - defines the parameter of sorting. It may contain one property:
@@ -31,25 +31,27 @@ grid.data.sort({
3131
}
3232
});
3333

34-
// cancels applied sorting rules
34+
// cancels the applied sorting rules
3535
grid.data.sort();
3636

3737
@descr:
3838

3939
**Related sample**: [Data. Sorting](https://snippet.dhtmlx.com/lz351u47)
4040

41-
{{note Calling the method without parameters will discard all applied sorting rules.}}
41+
:::note
42+
Calling the method without parameters will discard all applied sorting rules.
43+
:::
4244

4345
### Custom sorting
4446

45-
To set a custom function for sorting you need to specify the **rule** attribute in a passed object. For example:
47+
To set a custom function for sorting, you need to specify the `rule` attribute in a passed object. For example:
4648

47-
~~~js
49+
~~~jsx
4850
grid.data.sort({
4951
rule: (a, b) => a.id > b.id ? 1 : (a.id < b.id ? -1 : 0)
5052
});
5153
~~~
5254

5355
@changelog:
5456

55-
The **config** parameter is added in v7.0.
57+
The `config` parameter is added in v7.0.

docs/dataview/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ In this section you will learn about common functionality of the library which c
154154

155155
## Any questions left?
156156

157-
<button class="support_btn"><a href="https://snippet.dhtmlx.com/all?tag=dataview">Check more samples >>></a> </button>
157+
<button class="support_btn"><a href="https://snippet.dhtmlx.com/j1yv94o8?tag=dataview">Check more samples >>></a> </button>
158158
<br>
159159
<button class="support_btn"><a href="https://forum.dhtmlx.com/c/suite/suite7/">Ask the community >>></a> </button>
160160

docs/form/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ In this section you will learn about common functionality of the library which c
181181

182182
## Any questions left?
183183

184-
<button class="support_btn"><a href="https://snippet.dhtmlx.com/all?tag=form">Check more samples >>></a> </button>
184+
<button class="support_btn"><a href="https://snippet.dhtmlx.com/ikyyekxq?tag=form">Check more samples >>></a> </button>
185185
<br>
186186
<button class="support_btn"><a href="https://forum.dhtmlx.com/c/suite/suite7/">Ask the community >>></a> </button>
187187

docs/grid/api/treegrid_mode/grid_aftercollapse_event.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: You can explore the afterCollapse event of Grid in the documentatio
66

77
# afterCollapse
88

9-
@short: fires after collapsing a treegrid
9+
@short: fires after collapsing Grid in the TreeGrid mode
1010

1111
:::note
1212
The event works only for Grid with the `type: "tree"` configuration option

docs/grid/api/treegrid_mode/grid_afterexpand_event.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: You can explore the afterExpand event of Grid in the documentation
66

77
# afterExpand
88

9-
@short: fires after expanding a treegrid
9+
@short: fires after expanding Grid in the TreeGrid mode
1010

1111
:::note
1212
The event works only for Grid with the `type: "tree"` configuration option

0 commit comments

Comments
 (0)