Sync with Kendo UI Professional

Author: Kendo Bot

docs/api/javascript/ui/filemanager.md

@@ -828,7 +828,7 @@ Defines the localization messages for the toolbar.
 
 ### messages.toolbar.createFolder `String`
 
-### messages.toolbar.uploadDialog `String`
+### messages.toolbar.upload `String`
 
 ### messages.toolbar.sortDirection `String`
 

docs/api/javascript/ui/panelbar.md

@@ -258,7 +258,7 @@ data source is fired. By default the widget will bind to the data source specifi
 
 #### Example - disable automatic binding
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     var dataSource = new kendo.data.HierarchicalDataSource({
       data: [ { text: "Jane Doe" }, { text: "John Doe" }]
@@ -301,7 +301,7 @@ Sets the field of the data item that provides the image URL of the **PanelBar**
 
 #### Example - specify custom image URL field
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     var items = [
       { text: "Baseball", image: "https://demos.telerik.com/kendo-ui/content/shared/icons/sports/baseball.png" },
@@ -323,7 +323,7 @@ If the `dataSource` option is an existing [kendo.data.HierarchicalDataSource](/a
 
 #### Example - set dataSource as a JavaScript object
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       dataSource: {
@@ -378,7 +378,7 @@ If the `dataSource` option is an existing [kendo.data.HierarchicalDataSource](/a
 
 #### Example - set dataSource as an existing kendo.data.HierarchicalDataSource instance
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     var dataSource = new kendo.data.HierarchicalDataSource({
       transport: {
@@ -413,7 +413,7 @@ If an array, each level uses the field that is at the same index in the array, o
             background-image: url("https://demos.telerik.com/kendo-ui/content/shared/styles/flags.png");
         }
     </style>
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     var items = [
       { text: "Brazil", sprite: "brazilFlag" },
@@ -432,7 +432,7 @@ If an array, each level uses the field that is at the same index in the array, o
 
 #### Example
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     var items = [
       { ProductName: "Tea", items: [
@@ -449,7 +449,7 @@ If an array, each level uses the field that is at the same index in the array, o
 
 #### Example - using different fields on different levels
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     var items = [
       { CategoryName: "Tea", items: [
@@ -470,7 +470,7 @@ Sets the field of the data item that provides the link URL of the nodes.
 
 #### Example
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     var items = [
       { text: "Tea", LinksTo: "http://tea.example.com" },
@@ -526,7 +526,7 @@ Setting this to false causes all child DataSources to be loaded at initializatio
 
 #### Example - force lazy loading of sublevels
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       loadOnDemand: true,
@@ -544,7 +544,7 @@ The text messages displayed in the widget. Use it to customize or localize the m
 
 #### Example - customize PanelBar messages
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       dataSource: {
@@ -571,7 +571,7 @@ The text message shown while the root level items are loading.
 
 #### Example - customize loading message
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       dataSource: {
@@ -596,7 +596,7 @@ The text message shown when an error occurs while fetching the content.
 
 #### Example - customize requestFailed message
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       dataSource: {
@@ -621,7 +621,7 @@ The text message shown in the retry button.
 
 #### Example - customize retry message
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       dataSource: {
@@ -646,7 +646,7 @@ Template for rendering each node.
 
 #### Example
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       template: "#= item.text # (#= item.inStock #)",
@@ -817,7 +817,7 @@ A string, DOM element or jQuery object which represents the item. A string is tr
 
 #### Example - get the data item of the first node
 
-    <div id="panelBar"></div>
+    <ul id="panelBar"></ul>
     <script>
         $("#panelBar").kendoPanelBar({
             dataSource: [
@@ -1450,7 +1450,7 @@ The node whose children have been changed. If the changes have occurred on the r
 
 #### Example - subscribe to the "dataBound" event during initialization
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     $("#panelbar").kendoPanelBar({
       dataSource: [
@@ -1466,7 +1466,7 @@ The node whose children have been changed. If the changes have occurred on the r
 
 #### Example - subscribe to the "dataBound" event after initialization
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
     function panelbar_dataBound(e) {
       console.log("DataBound", e.node);
@@ -1484,7 +1484,7 @@ The node whose children have been changed. If the changes have occurred on the r
 
 #### Example - show an empty message when no items have been loaded from the server
 
-    <div id="panelbar"></div>
+    <ul id="panelbar"></ul>
     <script>
       $("#panelbar").kendoPanelBar({
         dataSource: [],

docs/api/javascript/ui/scheduler.md

@@ -4299,16 +4299,16 @@ The complete list of the supported timezones is available in the [List of IANA t
 
 ### toolbar `Array`
 
-List of commands that the scheduler will display in its toolbar as buttons. Currently supports only the "pdf" command.
+List of commands that the scheduler will display in its toolbar as buttons. Currently supports only the "pdf" and "search" commands.
 
-The "pdf" command exports the scheduler in PDF format.
+The "pdf" command exports the scheduler in PDF format. The "search" option allows searching through Scheduler events titles.
 
 #### Example - specify the toolbar commands as array of strings
 
     <div id="scheduler"></div>
     <script>
     $("#scheduler").kendoScheduler({
-      toolbar: ["pdf"],
+      toolbar: ["pdf", "search"],
       date: new Date("2013/6/6"),
       dataSource: [
         {

docs/controls/editors/editor/preventing-xss.md

@@ -47,34 +47,35 @@ To allow the execution of scripts inside the Editor content:
 
 ## Serialization and Deserialization
 
-Script tags and DOM event attributes stripping, as well as value encoding, are built-in functionalities of the Editor. In addition, you can use the [`serialization.custom`](/api/javascript/ui/editor/configuration/serialization.custom) and [`deserialization.custom`](/api/javascript/ui/editor/configuration/deserialization.custom) options of the Editor, to implement your own sanitizing functionality.
+Script tags and DOM event attributes stripping, as well as value encoding, are built-in functionalities of the Editor. In addition, you can use the [`serialization.custom`](/api/javascript/ui/editor/configuration/serialization.custom) and [`deserialization.custom`](/api/javascript/ui/editor/configuration/deserialization.custom) options of the Editor.
 
-The following example demonstrates how to use the serialization and deserialization custom otpions, to sanitize the value of the Editor and remove `object` tags.
+The following example demonstrates how to use the serialization and deserialization custom otpions, to sanitize the value of the Editor by using [DOMPurify](https://github.com/cure53/DOMPurify) library.
 
 ```dojo
+<script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/2.0.12/purify.min.js"></script>
+ 
 <textarea id="editor"></textarea>
 <script>
-  function sanitizeHtml(html) {
-    var temp = $("<div></div>").html(html);
-    temp.find("object").remove();
-    return temp.html() || "\ufeff";
-  }
-
-  $("#editor").kendoEditor({
-    tools: [
-      "viewHtml"
-    ],
-    deserialization: {
-      custom: function(html) {
-        return sanitizeHtml(html);
-      }
-    },
-    serialization: {
-      custom: function(html) {
-        return sanitizeHtml(html);
-      }
+    function sanitizeHtml(html) {
+		var temp = $("<div></div>").html(window.DOMPurify.sanitize(html));
+		return temp.html() || "\ufeff";
     }
-  });
+
+    $("#editor").kendoEditor({
+		tools: [
+			"viewHtml"
+		],
+		deserialization: {
+			custom: function(html) {
+				return sanitizeHtml(html);
+			}
+		},
+		serialization: {
+			custom: function(html) {
+				return sanitizeHtml(html);
+			}
+		}
+    });
 
   var editor = $("#editor").getKendoEditor();
 

src/kendo.panelbar.js

@@ -400,10 +400,12 @@ var __meta__ = { // jshint ignore:line
                         "# } #" +
                     "</li>"
                 ),
-                loading: template("<div class='k-item'><span class='k-icon k-i-loading'></span> #: data.messages.loading #</div>"),
+                loading: template("<li class='k-item'><span class='k-icon k-i-loading'></span> #: data.messages.loading #</li>"),
                 retry: template(
-                    "#: data.messages.requestFailed # " +
-                    "<button class='k-button k-request-retry'>#: data.messages.retry #</button>"
+                    "<li class='k-item'>" +
+                        "#: data.messages.requestFailed # " +
+                        "<button class='k-button k-request-retry'>#: data.messages.retry #</button>" +
+                    "</li>"
                 ),
                 arrow: template("<span class='#= arrowClass(item) #'></span>"),
                 empty: template("")

src/kendo.window.js

@@ -1827,8 +1827,8 @@
                 that.resizeDirection = e.currentTarget.prop("className").replace("k-resize-handle k-resize-", "");
 
                 that.initialSize = {
-                    width: wrapper.width(),
-                    height: wrapper.height()
+                    width: wrapper.outerWidth(),
+                    height: wrapper.outerHeight()
                 };
 
                 wnd._updateBoundaries();
@@ -1949,6 +1949,7 @@
                 if (this._preventDragging) {
                     return;
                 }
+
                 var that = this,
                     wnd = that.owner,
                     wrapper = wnd.wrapper;

tests/window/interaction.js

@@ -161,19 +161,19 @@
         });
 
         it("resizing window horizontally does not update vertical positioning", function() {
-            var initialWidth = dialog.wrapper.width();
+            var initialHeight= dialog.wrapper.outerHeight();
 
-            resize("w", 0, 100);
+            resize("w", 100, 0);
 
-            assert.equal(dialog.wrapper.width(), initialWidth);
+            assert.equal(dialog.wrapper.outerHeight(), initialHeight);
         });
 
         it("resizing window vertically does not update horizontal positioning", function() {
-            var initialHeight = dialog.wrapper.height();
+            var initialWidth = dialog.wrapper.outerWidth();
 
-            resize("n", 100, 0);
+            resize("n", 0, 100);
 
-            assert.equal(dialog.wrapper.height(), initialHeight);
+            assert.equal(dialog.wrapper.outerWidth(), initialWidth);
         });
     });