Skip to content

Commit 555cd9a

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent cc1b4ab commit 555cd9a

File tree

4 files changed

+2344
-2260
lines changed

4 files changed

+2344
-2260
lines changed

docs-aspnet-mvc/getting-started/asp-net-mvc-5.md

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ Below are listed the steps for you to follow when copying the required JavaScrip
5555

5656
1. Navigate to the install location of Telerik UI for ASP.NET MVC. By default, it is in `C:\Program Files (x86)\Progress\`. For versions prior to R3 2017, the default install location is in `C:\Program Files (x86)\Telerik\`.
5757

58-
1. Copy the `js` directory from the install location and paste it in the `Scripts` folder of the application.
58+
1. Drag the `js` directory from the install location and drop it in Visual Studio over the `Scripts` folder of the application.
5959

60-
1. Copy the `styles` directory from the install location and paste it in the `Content` folder of the application.
60+
1. Drag the `styles` directory from the install location and drop it in Visual Studio over the `Content` folder of the application.
6161

6262
1. Rename the `Scripts/js` directory to `Scripts/kendo`. Rename `Content/styles` to `Content/kendo`.
6363

@@ -128,6 +128,10 @@ Below are listed the steps for you to follow when copying the required JavaScrip
128128
@Scripts.Render("~/bundles/kendo")
129129
```
130130
131+
> **Important**
132+
>
133+
> Make sure the jQuery version you are loading is [supported by Kendo UI](https://docs.telerik.com/kendo-ui/intro/installation/prerequisites#supported-jquery-versions).
134+
131135
#### Use CDN Services
132136
133137
Below are listed the steps for you to follow when including the Telerik UI for ASP.NET MVC JavaScript and CSS files from CDN.
@@ -138,7 +142,7 @@ Below are listed the steps for you to follow when including the Telerik UI for A
138142
139143
1. Open the layout of the application. By default, it is `Views/Shared/_Layout.cshtml`, or `Site.master` if using ASPX.
140144
141-
1. Include `kendo.common-bootstrap.min.css` and `kendo.bootstrap.min.css`. Add a `link` tag within the `head` tag of the layout.
145+
1. Include `kendo.common-bootstrap.min.css` and `kendo.bootstrap.min.css`. Add a `link` tag within the `head` tag of the layout. For more information on the different CSS files used by the predefined Kendo UI Less themes, see [Less-Based Themes](https://docs.telerik.com/kendo-ui/styles-and-layout/appearance-styling).
142146
143147
###### Example
144148
@@ -172,6 +176,13 @@ The next step is to add a reference to `Kendo.Mvc.dll` which is the assembly con
172176
173177
1. Select `Kendo.Mvc.dll`. Click **OK**.
174178
179+
Alternatively, you can copy the assembly from the Telerik UI for ASP.NET MVC install location, paste it in the `bin` folder of the application and reference it from there.
180+
181+
> **Important**
182+
>
183+
> `Kendo.Mvc.dll` depends on the latest version of `System.Web.Mvc`. If an older version of MVC is used in the application, upgrade it to the latest version: [ASP.NET MVC 5 Nuget](https://www.nuget.org/packages/Microsoft.AspNet.Mvc/).
184+
185+
175186
### Update web.config
176187
177188
The next step is to let ASP.NET MVC know of the `Kendo.Mvc.UI` namespace where the server-side wrappers are. To do this, update the `web.config` file of the web application.
@@ -196,10 +207,16 @@ The next step is to let ASP.NET MVC know of the `Kendo.Mvc.UI` namespace where t
196207
197208
###### Example
198209
199-
<dependentAssembly>
200-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
201-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
202-
</dependentAssembly>
210+
<configuration>
211+
<runtime>
212+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
213+
<dependentAssembly>
214+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
215+
<bindingRedirect oldVersion="1.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
216+
</dependentAssembly>
217+
</assemblyBinding>
218+
</runtime>
219+
</configuration>
203220
204221
1. For issues with unmatching versions of `System.Web.Mvc` referenced in the application and the one used by Kendo.Mvc.dll see [Troubleshooting]({% slug troubleshooting_aspnetmvc %})
205222

src/kendo.data.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2215,7 +2215,7 @@ var __meta__ = { // jshint ignore:line
22152215
}
22162216

22172217
function eachGroupItems(data, func) {
2218-
for (var idx = 0, length = data.length; idx < length; idx++) {
2218+
for (var idx = 0; idx < data.length; idx++) {
22192219
if (data[idx].hasSubgroups) {
22202220
if (eachGroupItems(data[idx].items, func)) {
22212221
return true;
@@ -3701,6 +3701,10 @@ var __meta__ = { // jshint ignore:line
37013701
options.aggregate = that._aggregate;
37023702
}
37033703

3704+
if (that.options.serverGrouping) {
3705+
that._clearEmptyGroups(data);
3706+
}
3707+
37043708
result = that._queryProcess(data, options);
37053709

37063710
if (that.options.serverAggregates !== true) {
@@ -3720,6 +3724,19 @@ var __meta__ = { // jshint ignore:line
37203724
that.trigger(CHANGE, e);
37213725
},
37223726

3727+
_clearEmptyGroups: function(data) {
3728+
for (var idx = data.length - 1; idx >=0; idx--) {
3729+
var group = data[idx];
3730+
if (group.hasSubgroups) {
3731+
this._clearEmptyGroups(group.items);
3732+
} else {
3733+
if (group.items && !group.items.length) {
3734+
splice.apply(group.parent(), [idx, 1]);
3735+
}
3736+
}
3737+
}
3738+
},
3739+
37233740
_queryProcess: function(data, options) {
37243741
if (this.options.inPlaceSort) {
37253742
return Query.process(data, options, this.options.inPlaceSort);

src/kendo.list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ var __meta__ = { // jshint ignore:line
16051605
if (that._userTriggered) {
16061606
that._clearSelection(parent, true);
16071607
} else if (value) {
1608-
if (value !== that.listView.value()[0]) {
1608+
if (value !== unifyType(that.listView.value()[0], typeof value)) {
16091609
that.value(value);
16101610
}
16111611

0 commit comments

Comments
 (0)