Sync with Kendo UI Professional

Author: Kendo Bot

docs-aspnet/knowledge-base/grid-custom-pager-placed-outside.md

@@ -1,3 +1,4 @@
+---
 title: Implement a custom Pager for a Telerik UI Grid
 description: An example on how to add a Pager with different custom functionalities and styles.
 type: how-to

docs/knowledge-base/grid-filter-parent-and-child.md

@@ -0,0 +1,144 @@
+---
+title: Filter both Parent and Child Grids in Hierarchy
+description: An example on how to apply filters on both parent and child Grids in Hierarchy.
+type: how-to
+page_title: Update Adjacent Cells in Rows in Inline Edit Mode | Kendo UI Grid for jQuery
+slug: grid-apply-filter-parent-child
+tags: grid, filter, parent, child, hierarchy, detail
+ticketid: 1573560
+res_type: kb
+---
+
+## Environment
+
+<table>
+ <tr>
+  <td>Product</td>
+  <td>Progress Kendo UI Grid</td>
+ </tr>
+ <tr>
+  <td>Operating System</td>
+  <td>All</td>
+ </tr>
+ <tr>
+  <td>Browser</td>
+  <td>All</td>
+ </tr>
+ <tr>
+  <td>Browser Version</td>
+  <td>All</td>
+ </tr>
+</table>
+
+## Description
+
+How can I apply filter to both the parent and child Grids in Hierarchy?
+
+## Solution
+
+It is possible to perform filtering over the parent Grid and the child Grid by ensuring the fetching of the filtered data for the parent Grid has finished. This is done by applying the filter to the child Grid in the [`dataBound`](/api/javascript/ui/grid/events/databound) event handler of the parent one.
+
+```dojo
+    <button class="k-button k-button-solid-base k-button-solid k-button-md k-rounded-md" onclick="filter()">Filter Parent and Child</button>
+    <div id="grid"></div>
+
+    <script type="text/x-kendo-template" id="template">
+         <div class="orders"></div>
+    </script>
+
+    <script>
+      $(document).ready(function() {
+        var element = $("#grid").kendoGrid({
+          dataSource: {
+            type: "odata",
+            transport: {
+              read: "https://demos.telerik.com/kendo-ui/service/Northwind.svc/Employees"
+            },
+            pageSize: 20,
+            serverPaging: true,
+            serverSorting: true
+          },
+          height: 400,
+          filterable: true,
+          sortable: true,
+          pageable: false,
+          detailTemplate: kendo.template($("#template").html()),
+          detailInit: detailInit,
+          dataBound: function() {
+            this.expandRow(this.tbody.find("tr.k-master-row").first());
+          },
+          columns: [
+            {
+              field: "FirstName",
+              title: "First Name",
+              width: "120px"
+            },
+            {
+              field: "LastName",
+              title: "Last Name",
+              width: "120px"
+            },
+            {
+              field: "Country",
+              width: "120px"
+            },
+            {
+              field: "City",
+              width: "120px"
+            },
+            {
+              field: "Title"
+            }
+          ]
+        });
+      });
+
+      function detailInit(e) {
+        var detailRow = e.detailRow;
+
+        detailRow.find(".detailTabstrip").kendoTabStrip({
+          animation: {
+            open: { effects: "fadeIn" }
+          }
+        });
+
+        detailRow.find(".orders").kendoGrid({
+          dataSource: {
+            type: "odata",
+            transport: {
+              read: "https://demos.telerik.com/kendo-ui/service/Northwind.svc/Orders"
+            },
+            serverPaging: true,
+            serverSorting: true,
+            serverFiltering: true,
+            pageSize: 7,
+            filter: { field: "EmployeeID", operator: "eq", value: e.data.EmployeeID }
+          },
+          scrollable: false,
+          filterable: true,
+          sortable: true,
+          pageable: true,
+          columns: [
+            { field: "OrderID", title:"ID", width: "70px" },
+            { field: "ShipCountry", title:"Ship Country", width: "110px" },
+            { field: "ShipAddress", title:"Ship Address" },
+            { field: "ShipName", title: "Ship Name", width: "300px" }
+          ]
+        });
+      }
+
+      function filter() {
+        var mainGrid = $("#grid").data("kendoGrid");
+        mainGrid.dataSource.filter({ field: "City", operator: "eq", value: "Seattle" })
+        mainGrid.bind("dataBound", function() {
+          var detailGrid = $(".orders").data("kendoGrid");
+          detailGrid.dataSource.filter({ field: "ShipCountry", operator: "eq", value: "Italy" })
+        })
+      }
+    </script>
+```
+
+## See Also
+
+* [API Reference of the Grid](/api/javascript/ui/grid)
+* [The dataBound Event of the Grid](https://docs.telerik.com/kendo-ui/api/javascript/ui/grid/events/databound)

package-lock.json

@@ -10,10 +10,10 @@
   "license": "Apache-2.0",
   "version": "1.0.0",
   "devDependencies": {
-    "@progress/kendo-theme-bootstrap": "5.6.0",
-    "@progress/kendo-theme-classic": "5.6.0",
-    "@progress/kendo-theme-default": "5.6.0",
-    "@progress/kendo-theme-material": "5.6.0",
+    "@progress/kendo-theme-bootstrap": "5.7.0",
+    "@progress/kendo-theme-classic": "5.7.0",
+    "@progress/kendo-theme-default": "5.7.0",
+    "@progress/kendo-theme-material": "5.7.0",
     "autoprefixer": "^9.1.5",
     "axe-core": "^4.4.2",
     "bootstrap": "^4.0.0",

package.json

@@ -130,12 +130,19 @@ var __meta__ = {
         setOptions: function(options) {
             this.destroy();
 
-            this.element.unwrap();
-            if (this._floatingLabelContainer) {
+            if (this._inputLabel) {
                 this._inputLabel.remove();
                 this._inputLabel = null;
+            }
+
+            if (this._floatingLabelContainer) {
+                this.floatingLabel.destroy();
+                this.floatingLabel = null;
+                this.element.unwrap();
                 this.element.unwrap();
                 this._floatingLabelContainer = null;
+            } else {
+                this.element.unwrap();
             }
 
             kendo.deepExtend(this.options, options);

src/kendo.textbox.js

@@ -27,6 +27,14 @@
             assert.equal(input.attr("disabled"), undefined);
         });
 
+        it("setOptions does not duplicate labels", function() {
+            var textbox = new TextBox(input, { label: "Set name" });
+
+            textbox.setOptions({});
+
+            assert.equal($(".k-input-label").length, 1);
+        });
+
         it("enable(false) removes readonly attribute and no-click class", function() {
             var textbox = input.kendoTextBox().data("kendoTextBox");