Sync with Kendo UI Professional

Author: kendo-bot

docs/api/javascript/ui/pager.md

@@ -287,7 +287,7 @@ Defines if a label showing current paging information will be displayed.
     </style>
 
 ### input `Boolean`*(default: false)*
-Defines if an input element which allows the user to navigate to given page will be displayed. If enabled the numeric buttons for pages will not be rendered.
+Defines if an input element which allows the user to navigate to given page will be displayed. If enabled only the numeric input will be rendered in the numeric portion of the pager.
 
 #### Example - show the navigate-to-page input
 
@@ -307,7 +307,7 @@ Defines if an input element which allows the user to navigate to given page will
         $("#pager").kendoPager({
           dataSource: dataSource,
           input: true,
-          numeric: false
+          numeric: true
         });
 
         dataSource.read();
@@ -625,7 +625,7 @@ The label displayed before the pager input.
         $("#pager").kendoPager({
           dataSource: dataSource,
           input: true,
-          numeric: false,
+          numeric: true,
           messages: {
             page: "Enter page"
           }
@@ -661,7 +661,6 @@ The title of the numeric link page buttons of the **Pager**. The parameters avai
         $("#pager").kendoPager({
           dataSource: dataSource,
           input: true,
-          numeric: false,
           messages: {
             pageButtonLabel: "This is page {0}"
           }
@@ -677,7 +676,7 @@ The title of the numeric link page buttons of the **Pager**. The parameters avai
 
 ### messages.pageSizeDropDownLabel `String`*(default: "Page sizes drop down")*
 
-The label applied to the page size DropDOwnList.
+The label applied to the page size DropDownList.
 
 #### Example
     <div id="pager"></div>
@@ -696,7 +695,7 @@ The label applied to the page size DropDOwnList.
         $("#pager").kendoPager({
           dataSource: dataSource,
           input: true,
-          numeric: false,
+          numeric: true,
           messages: {
             pageSizeDropDownLabel: "page size"
           },
@@ -726,7 +725,7 @@ The label displayed before the pager input. Uses [kendo.format](/api/javascript/
         $("#pager").kendoPager({
           dataSource: dataSource,
           input: true,
-          numeric: false,
+          numeric: true,
           messages: {
             of: "from {0}"
           }

src/kendo.combobox.js

@@ -67,7 +67,13 @@ export const __meta__ = {
             options = that.options;
             element = that.element.on("focus" + ns, that._focusHandler.bind(that));
 
-            options.readonly = kendo.isPresent(options.readonly) ? options.readonly : Boolean(that.element.attr("readonly"));
+            if (!kendo.isPresent(options.readonly) && element.attr("readonly")) {
+                 options.readonly = true;
+            }
+            else if (!kendo.isPresent(options.readonly)) {
+                 options.readonly = false;
+            }
+
             options.placeholder = options.placeholder || element.attr("placeholder");
             options.inputMode = options.inputMode || element.attr("inputmode") || "text";
 
@@ -148,7 +154,7 @@ export const __meta__ = {
             delay: 200,
             dataTextField: "",
             dataValueField: "",
-            readonly: false,
+            readonly: null,
             minLength: 1,
             enforceMinLength: false,
             height: 200,

src/kendo.dropdownlist.js

@@ -66,7 +66,12 @@ export const __meta__ = {
             options = that.options;
             element = that.element.on("focus" + ns, that._focusHandler.bind(that));
 
-            options.readonly = kendo.isPresent(options.readonly) ? options.readonly : Boolean(that.element.attr("readonly"));
+            if (!kendo.isPresent(options.readonly) && element.attr("readonly")) {
+                 options.readonly = true;
+            }
+            else if (!kendo.isPresent(options.readonly)) {
+                 options.readonly = false;
+            }
 
             that._focusInputHandler = that._focusInput.bind(that);
 
@@ -183,7 +188,7 @@ export const __meta__ = {
             autoWidth: false,
             popup: null,
             filterTitle: null,
-            readonly: false,
+            readonly: null,
             size: "medium",
             fillMode: "solid",
             rounded: "medium",

src/kendo.list.js

@@ -951,7 +951,7 @@ export const __meta__ = {
             if (!options.enabled || disabled) {
                 that.enable(false);
             } else {
-                that.readonly(options.readonly || that.element.is("[readonly]"));
+                that.readonly(kendo.isPresent(options.readonly) ? options.readonly : that.element.is("[readonly]"));
             }
         },
 

src/kendo.multiselect.js

@@ -87,7 +87,13 @@ export const __meta__ = {
             that._optionsMap = {};
             that._customOptions = {};
             that.options.inputMode = that.options.inputMode || that.element.attr("inputmode") || "text";
-            that.options.readonly = kendo.isPresent(that.options.readonly) ? that.options.readonly : Boolean(that.element.attr("readonly"));
+
+            if (!kendo.isPresent(that.options.readonly) && that.element.attr("readonly")) {
+                 that.options.readonly = true;
+            }
+            else if (!kendo.isPresent(that.options.readonly)) {
+                 that.options.readonly = false;
+            }
 
             that._wrapper();
             that._inputValuesContainer();
@@ -167,7 +173,7 @@ export const __meta__ = {
             enabled: true,
             autoBind: true,
             autoClose: true,
-            readonly: false,
+            readonly: null,
             highlightFirst: true,
             dataTextField: "",
             dataValueField: "",

src/kendo.validator.js

@@ -418,11 +418,14 @@ export const __meta__ = {
                 let invalid = false;
 
                 inputs = containerElement.find(this._inputSelector);
-                let fileInput = containerElement.find("input[type='file']");
 
-                if (fileInput.length) {
-                    Array.prototype.push.call(inputs, $(fileInput.first())[0]);
-                }
+                containerElement.find(UPLOADBUTTONWRAPPER).each(function() {
+                    let firstFileInput = $(this).find("input[type='file']").first();
+                    if (firstFileInput.length) {
+                        Array.prototype.push.call(inputs, firstFileInput[0]);
+                    }
+                });
+
                 for (idx = 0, length = inputs.length; idx < length; idx++) {
                     if (!this.validateInput(inputs.eq(idx))) {
                         invalid = true;

tests/unit/combobox/initialization.js

@@ -1387,6 +1387,51 @@ import { stub } from '../../helpers/unit/stub.js';
 
             assert.isOk(combobox.wrapper.attr("aria-readonly", true));
             assert.isOk(combobox.input.attr("readonly"));
-        })
-    });
+            assert.equal(combobox.options.readonly, true);
+        });
+
+        it ("Should set readonly state from attribute", function() {
+            input = $("<input readonly='readonly' class='test' style='width: 200px' />").appendTo(Mocha.fixture);
+
+            let combobox = new ComboBox(input, {
+                dataValueField: "name",
+                dataTextField: "name",
+                dataSource: {
+                    data: [
+                        { name: "item1", value: "1" },
+                        { name: "item2", value: "2" },
+                        { name: "item3", value: "3" }
+                    ],
+                    group: "name"
+                },
+                label: () => `some label`
+            });
+
+             assert.isOk(combobox.wrapper.attr("aria-readonly", true));
+             assert.isOk(combobox.element.attr("readonly"));
+             assert.equal(combobox.options.readonly, true);
+        });
+
+        it ("Should take readonly option with higher precedent over attribute", function() {
+             input = $("<input readonly='readonly' class='test' style='width: 200px' />").appendTo(Mocha.fixture);
+
+             let combobox = new ComboBox(input, {
+                 dataValueField: "name",
+                 dataTextField: "name",
+                 readonly: false,
+                 dataSource: {
+                     data: [
+                         { name: "item1", value: "1" },
+                         { name: "item2", value: "2" },
+                         { name: "item3", value: "3" }
+                     ],
+                     group: "name"
+                 },
+                 label: () => `some label`
+             });
+
+             assert.isOk(combobox.wrapper.attr("aria-readonly", false));
+             assert.equal(combobox.options.readonly, false);
+        });
+});
 

tests/unit/dropdownlist/initialization.js

@@ -1786,5 +1786,50 @@ describe("kendo.ui.DropDownList initialization", function() {
 
         assert.isOk(dropdownlist.wrapper.attr("aria-readonly", true));
         assert.isOk(dropdownlist.element.attr("readonly"));
-    })
+        assert.equal(dropdownlist.options.readonly, true);
+    });
+
+    it ("Should set readonly state from attribute", function() {
+        input = $("<input readonly='readonly' class='test' style='width: 200px' />").appendTo(Mocha.fixture);
+
+        let dropdownlist = new DropDownList(input, {
+            dataValueField: "name",
+            dataTextField: "name",
+            dataSource: {
+                data: [
+                    { name: "item1", value: "1" },
+                    { name: "item2", value: "2" },
+                    { name: "item3", value: "3" }
+                ],
+                group: "name"
+            },
+            label: () => `some label`
+        });
+
+         assert.isOk(dropdownlist.wrapper.attr("aria-readonly", true));
+         assert.isOk(dropdownlist.element.attr("readonly"));
+         assert.equal(dropdownlist.options.readonly, true);
+    });
+
+    it ("Should take readonly option with higher precedent over attribute", function() {
+        input = $("<input readonly='readonly' class='test' style='width: 200px' />").appendTo(Mocha.fixture);
+
+        let dropdownlist = new DropDownList(input, {
+            dataValueField: "name",
+            dataTextField: "name",
+            readonly: false,
+            dataSource: {
+                data: [
+                    { name: "item1", value: "1" },
+                    { name: "item2", value: "2" },
+                    { name: "item3", value: "3" }
+                ],
+                group: "name"
+            },
+            label: () => `some label`
+        });
+
+         assert.isOk(dropdownlist.wrapper.attr("aria-readonly", false));
+         assert.equal(dropdownlist.options.readonly, false);
+    });
 });

tests/unit/multiselect/initialization.js

@@ -1098,6 +1098,51 @@ import { asyncTest } from '../../helpers/unit/async-utils.js';
         });
 
         assert.isOk(multiselect.wrapper.attr("aria-readonly", true));
+        assert.equal(multiselect.options.readonly, true);
         assert.isOk(multiselect.input.attr("readonly"));
-    })
     });
+
+    it ("Should set readonly state from attribute", function() {
+        select = $("<select multiple readonly='readonly' />").appendTo(Mocha.fixture);
+
+         let multiSelect = new MultiSelect(select, {
+             dataValueField: "name",
+             dataTextField: "name",
+             dataSource: {
+                 data: [
+                     { name: "item1", value: "1" },
+                     { name: "item2", value: "2" },
+                     { name: "item3", value: "3" }
+                 ],
+                 group: "name"
+             },
+             label: () => `some label`
+         });
+
+          assert.isOk(multiSelect.wrapper.attr("aria-readonly", true));
+          assert.isOk(multiSelect.element.attr("readonly"));
+          assert.equal(multiSelect.options.readonly, true);
+     });
+
+     it ("Should take readonly option with higher precedent over attribute", function() {
+          select = $("<select multiple readonly='readonly' />").appendTo(Mocha.fixture);
+
+          let multiSelect = new MultiSelect(select, {
+              dataValueField: "name",
+              dataTextField: "name",
+              readonly: false,
+              dataSource: {
+                  data: [
+                      { name: "item1", value: "1" },
+                      { name: "item2", value: "2" },
+                      { name: "item3", value: "3" }
+                  ],
+                  group: "name"
+              },
+              label: () => `some label`
+          });
+
+          assert.isOk(multiSelect.wrapper.attr("aria-readonly", false));
+          assert.equal(multiSelect.options.readonly, false);
+     });
+});