Skip to content

Commit

Permalink
Sync with Kendo UI Professional
Browse files Browse the repository at this point in the history
  • Loading branch information
Kendo Bot committed May 17, 2018
1 parent bd0f0ba commit fa6f4cf
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
4 changes: 2 additions & 2 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,10 @@ navigation:
baseurl: /kendo-ui

## The Kendo UI version used
cdnVersion: "2018.2.515"
cdnVersion: "2018.2.516"

## The MVC Core version used
mvcCoreVersion: "2018.2.515"
mvcCoreVersion: "2018.2.516"

## Progress NPM Registry
registry_url: 'https://registry.npm.telerik.com/'
Expand Down
8 changes: 4 additions & 4 deletions docs/api/javascript/ui/dropdowntree.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ If set to `true`, the widget automatically adjusts the width of the popup elemen

When this options is set to `true` and [checkboxes](/api/javascript/ui/dropdowntree/configuration/checkboxes) are enabled, a tristate checkbox appears above the embedded treeview. Clicking that checkbox will check or uncheck all the loaded enabled items of the treeview.

> Note: when 'checkAll' is set to 'true' it is recommended that [loadOnDemand](/api/javascript/ui/dropdowntree/configuration/loadOnDemand) is set to 'true' because otherwise checkAll may not interact with all subnodes of the treeview.
> Note: when 'checkAll' is set to 'true' it is recommended that [loadOnDemand](/api/javascript/ui/dropdowntree/configuration/loadondemand) is set to 'true' because otherwise checkAll may not interact with all subnodes of the treeview.
#### Example - disable the clear button

Expand Down Expand Up @@ -185,7 +185,7 @@ The [template](/api/javascript/kendo/methods/template) used to render the checkA

### checkboxes `Boolean|Object`

If `true` or an object, renders checkboxes beside each node. In this case the widget [value](/api/javascript/ui/dropdowntree/value) should be an array.
If `true` or an object, renders checkboxes beside each node. In this case the widget [value](/api/javascript/ui/dropdowntree/configuration/value) should be an array.

#### Example - show node checkboxes

Expand All @@ -209,7 +209,7 @@ If `true` or an object, renders checkboxes beside each node. In this case the wi
Indicates whether checkboxes of child items should get checked when the checkbox of a parent item is checked. This
also enables tri-state checkboxes with an indeterminate state.

> Note: when [filter](/api/javascript/ui/dropdowntree/filter) is enabled 'checkboxes.checkChildren' property is reset to 'false' because enabling both at the same time could lead to ambiguous scenarios. Currently this scenario not supported by the widget.
> Note: when [filter](/api/javascript/ui/dropdowntree/configuration/filter) is enabled 'checkboxes.checkChildren' property is reset to 'false' because enabling both at the same time could lead to ambiguous scenarios. Currently this scenario not supported by the widget.
#### Example - enable tri-state checkboxes and propagate checked state to children

Expand Down Expand Up @@ -427,7 +427,7 @@ If an array, each level uses the field that is at the same index in the array, o
Sets the field of the data item that provides the text content of the nodes.
If an array, each level uses the field that is at the same index in the array, or the last item in the array.

> **Important** In case when array is used, [filter](/api/javascript/ui/dropdowntree/filter) is not supported because
> **Important** In case when array is used, [filter](/api/javascript/ui/dropdowntree/configuration/filter) is not supported because
[hierarchical data source](/api/javascript/data/hierarchicaldatasource) does not support filtering by different fields yet.

#### Example - set the dataTextField
Expand Down
7 changes: 6 additions & 1 deletion docs/controls/conversational-ui/chat/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ To create a Chat:

1. Add an empty `div` to the HTML.
1. Provide it with an ID.
1. (Optional) Set the width and height of the desired chat inline or by using CSS &mdash;<div id="chart" style="width: 400px; height: 600px"></div>.
1. (Optional) Set the width and height of the desired chat inline or by using CSS.

###### Example

<div id="chart" style="width: 400px; height: 600px"></div>


### Initialize the Chat

Expand Down
2 changes: 1 addition & 1 deletion docs/redirects.conf
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rewrite ^/kendo-ui/dataviz/chart/(.*)$
permanent;

rewrite ^/kendo-ui/web/chat/(.*)$
/kendo-ui/controls/conversational-ui/$1
/kendo-ui/controls/conversational-ui/chat/$1
permanent;

rewrite ^/kendo-ui/dataviz/(sparkline|treemap|stockchart)/(.*)$
Expand Down

0 comments on commit fa6f4cf

Please sign in to comment.