Sync with Kendo UI Professional

Author: Kendo Bot

docs/api/javascript/ui/treelist.md

@@ -5708,6 +5708,11 @@ A string, a DOM element, or a jQuery object which represents the table row. A st
       });
     </script>
 
+### getOptions
+
+Retrieves the options that are currently enabled or disabled on the Treelist, also gives the current state of the dataSource.
+Use this method if you want to save the state of the Treelist into a variable. It is also possible to extract and store only some of the Treelist options.
+
 ### itemFor
 
 (Available as of the 2015.3.930 release) Returns the rendered HTML element for a given model.
@@ -6096,6 +6101,22 @@ The data source to which the widget will be bound.
       });
     </script>
 
+### setOptions
+
+Sets the options of the Treelist. Use this method if you want to enable/disable a particular feature/option or to load
+the complete state obtained previously with the [`getOptions`](getoptions) method.
+
+When `setOptions` is called, the Treelist widget will be destroyed and recreated. If the widget is bound to remote data, a new read request will be made.
+
+> There are a few important things to keep in mind when using `getOptions` and `setOptions`.
+>
+> * **calling `setOptions()` in a Treelist event handler is not possible.**
+> * **calling `setOptions()` in a function, which is related to the Treelist's databinding mechanism may cause an endless loop.**
+> * `JSON.stringify()` cannot serialize function references (e.g. event handlers), so if stringification is used for the retrieved Treelist state,
+> all configuration fields, which represent function references, will be lost. You have two options to avoid this limitation:
+> use a [custom implementation](https://github.com/tarruda/super-json) to serialize JavaScript functions, or
+> add the function references back to the deserialized configuration object before passing it to the `setOptions` method.
+
 ### showColumn
 
 Shows the specified column.

package.json

@@ -11,9 +11,9 @@
   "version": "1.0.0",
   "dependencies": {},
   "devDependencies": {
-    "@progress/kendo-theme-bootstrap": "4.23.0",
-    "@progress/kendo-theme-default": "4.25.0",
-    "@progress/kendo-theme-material": "3.21.0",
+    "@progress/kendo-theme-bootstrap": "4.24.0",
+    "@progress/kendo-theme-default": "4.26.0",
+    "@progress/kendo-theme-material": "3.22.0",
     "amd-optimize": "0.6.1",
     "autoprefixer": "^9.1.5",
     "bootstrap": "^4.0.0",

src/kendo.validator.js

@@ -114,6 +114,23 @@ var __meta__ = { // jshint ignore:line
         return containers;
     }
 
+    function isLabelFor(label, element) {
+        if (!label) {
+            return false;
+        }
+        if (typeof label.nodeName !== 'string' || label.nodeName !== 'LABEL') {
+            return false;
+        }
+        if (typeof label.getAttribute('for') !== 'string' || typeof element.getAttribute('id') !== 'string') {
+            return false;
+        }
+        if (label.getAttribute('for') !== element.getAttribute('id')) {
+            return false;
+        }
+
+        return true;
+    }
+
     var SUMMARYTEMPLATE = '<ul>' +
         '#for(var i = 0; i < errors.length; i += 1){#' +
             '<li><a data-field="#=errors[i].field#" href="\\#">#= errors[i].message #</a></li>' +
@@ -391,15 +408,19 @@ var __meta__ = { // jshint ignore:line
                     var widgetInstance = kendo.widgetInstance(input);
                     var parentElement = input.parent().get(0);
                     var nextElement = input.next().get(0);
+                    var prevElement = input.prev().get(0);
 
-                    if (parentElement && parentElement.nodeName === "LABEL") {
+                    if (widgetInstance && widgetInstance.wrapper) {
+                        messageLabel.insertAfter(widgetInstance.wrapper);
+                    } else if (parentElement && parentElement.nodeName === "LABEL") {
                         // Input inside label
                         messageLabel.insertAfter(parentElement);
-                    } else if (nextElement && nextElement.nodeName === "LABEL") {
+                    } else if (nextElement && isLabelFor(nextElement, input[0])) {
                         // Input before label
                         messageLabel.insertAfter(nextElement);
-                    } else if (widgetInstance && widgetInstance.wrapper) {
-                        messageLabel.insertAfter(widgetInstance.wrapper);
+                    } else if (prevElement && isLabelFor(prevElement, input[0])) {
+                        // Input after label
+                        messageLabel.insertAfter(input);
                     } else {
                         messageLabel.insertAfter(input);
                     }