From f0b4420eb9280ce50a057f8b48f65cfda0ccf234 Mon Sep 17 00:00:00 2001 From: kendo-bot Date: Thu, 25 Apr 2024 04:18:50 +0000 Subject: [PATCH] Sync with Kendo UI Professional --- .../charts/elements/trendlines.md | 14 +-- .../helper-basics/content-security-policy.md | 5 + docs/api/javascript/ui/aiprompt.md | 2 +- docs/api/javascript/ui/editor.md | 76 ++++++++++++- package-lock.json | 102 +++++++++--------- package.json | 16 +-- src/kendo.autocomplete.js | 6 +- src/kendo.dropdownlist.js | 1 + src/kendo.floatinglabel.js | 2 +- src/kendo.html.chip.js | 4 +- src/kendo.label.js | 14 +-- src/kendo.list.js | 1 + src/kendo.maskedtextbox.js | 3 +- src/kendo.numerictextbox.js | 3 +- src/kendo.textarea.js | 3 +- src/kendo.textbox.js | 4 +- typescript/kendo.all.d.ts | 14 ++- 17 files changed, 182 insertions(+), 88 deletions(-) diff --git a/docs-aspnet/html-helpers/charts/elements/trendlines.md b/docs-aspnet/html-helpers/charts/elements/trendlines.md index 35b0c3016da..02785384dec 100644 --- a/docs-aspnet/html-helpers/charts/elements/trendlines.md +++ b/docs-aspnet/html-helpers/charts/elements/trendlines.md @@ -19,7 +19,7 @@ A linear trendline is usually used to show if a particular quantity is increasin The following example demonstrates how to create a linear trendline for Categorical series. -``` +```HtmlHelper @(Html.Kendo().Chart() .Name("chart") .Title("Site Visitors Stats") @@ -92,7 +92,7 @@ Exponential trendlines are most suitable for data sets with accelerating rate of The following example demonstrates how to create a exponential trendline for Categorical series. -``` +```HtmlHelper @(Html.Kendo().Chart() .Name("chart") .Series(series => @@ -142,7 +142,7 @@ Logarithmic trendlines are best suited for data sets that grow quickly at the be The following example demonstrates how to create a logarithmic trendline for Categorical series. -``` +```HtmlHelper @(Html.Kendo().Chart() .Name("chart") .Series(series => @@ -192,7 +192,7 @@ Power trendlines are suitable for data that has a steady increase or decrease in The following example demonstrates how to create a power trendline for Categorical series. -``` +```HtmlHelper @(Html.Kendo().Chart() .Name("chart") .Series(series => @@ -251,7 +251,7 @@ The default order is 2. Accepted values are from 2 to 6: The following example demonstrates how to create a polynomial trendline for Categorical series. -``` +```HtmlHelper @(Html.Kendo().Chart() .Name("chart") .Series(series => @@ -303,7 +303,7 @@ The moving average trendline is used to smooth out the variations in the data by The following example demonstrates how to create a moving average trendline for Categorical series. -``` +```HtmlHelper @(Html.Kendo().Chart() .Name("chart") .Title("Site Visitors Stats") @@ -385,7 +385,7 @@ To create a forecast, extend the trendline by specifying the number of intervals The following example demonstrates how to create a forecast. -``` +```HtmlHelper @(Html.Kendo().Chart() .Name("chart") .Title("Site Visitors Stats") diff --git a/docs-aspnet/html-helpers/helper-basics/content-security-policy.md b/docs-aspnet/html-helpers/helper-basics/content-security-policy.md index e5a55665529..ec4934a1aa3 100644 --- a/docs-aspnet/html-helpers/helper-basics/content-security-policy.md +++ b/docs-aspnet/html-helpers/helper-basics/content-security-policy.md @@ -225,6 +225,11 @@ The Telerik UI for {{ site.framework }} releases before the R1 2023 SP1 one does ``` +1. Add the links used in the _Layout such as for example - `kendostatic`, `jquery`, and `unpkg(jszip)`: + + ``` + + ``` ## See Also diff --git a/docs/api/javascript/ui/aiprompt.md b/docs/api/javascript/ui/aiprompt.md index b585e171bc3..e0b55a100df 100644 --- a/docs/api/javascript/ui/aiprompt.md +++ b/docs/api/javascript/ui/aiprompt.md @@ -611,7 +611,7 @@ The index of the active view or the name of the view to show. If no argument is Adds a prompt output to the `promptOutputs` collection. If the active views is `OutputView`, calls the view's `addPromptOutput` method. -##### Parameters +#### Parameters ##### promptOutput `Object` diff --git a/docs/api/javascript/ui/editor.md b/docs/api/javascript/ui/editor.md index c44e232a3ea..5b60e9cc722 100644 --- a/docs/api/javascript/ui/editor.md +++ b/docs/api/javascript/ui/editor.md @@ -2432,9 +2432,9 @@ If enabled, the editor renders a resize handle to allow users to resize it. }); -### resizable.min `Number` +### resizable.min `Number|Object` -The minimum height that the editor can be resized to. +The minimum height that the editor can be resized to. If set to an object the user can restrict both min width and height values. #### Example @@ -2447,9 +2447,43 @@ The minimum height that the editor can be resized to. }); -### resizable.max `Number` +### resizable.min.minWidth `Number` -The maximum height that the editor can be resized to. +The minimum width that the editor can be resized to. + +#### Example + + + + +### resizable.min.minHeight `Number` + +The minimum height that the editor can be resized to. + +#### Example + + + + +### resizable.max `Number|Object` + +The maximum height that the editor can be resized to. If set to an object the user can restrict both max width and height values. #### Example @@ -2462,6 +2496,40 @@ The maximum height that the editor can be resized to. }); +### resizable.max.maxWidth `Number` + +The maximum width that the editor can be resized to. + +#### Example + + + + +### resizable.max.maxHeight `Number` + +The maximum height that the editor can be resized to. + +#### Example + + + + ### resizable.toolbar `Boolean` If `resizable` is set to `true` the widget will detect changes in the viewport width and will hide the overflowing controls in the tool overflow popup. diff --git a/package-lock.json b/package-lock.json index c8194556c77..15531ff2d30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,14 +9,14 @@ "version": "1.0.0", "license": "Apache-2.0", "devDependencies": { - "@progress/kendo-svg-icons": "2.1.0", - "@progress/kendo-theme-bootstrap": "7.2.1", - "@progress/kendo-theme-classic": "7.2.1", - "@progress/kendo-theme-core": "7.2.1", - "@progress/kendo-theme-default": "7.2.1", - "@progress/kendo-theme-fluent": "7.2.1", - "@progress/kendo-theme-material": "7.2.1", - "@progress/kendo-theme-utils": "7.2.1", + "@progress/kendo-svg-icons": "2.3.0", + "@progress/kendo-theme-bootstrap": "8.0.0-dev.8", + "@progress/kendo-theme-classic": "8.0.0-dev.8", + "@progress/kendo-theme-core": "8.0.0-dev.8", + "@progress/kendo-theme-default": "8.0.0-dev.8", + "@progress/kendo-theme-fluent": "8.0.0-dev.8", + "@progress/kendo-theme-material": "8.0.0-dev.8", + "@progress/kendo-theme-utils": "8.0.0-dev.8", "@progress/wct-a11y-spec": "^2.0.9", "@rollup/plugin-node-resolve": "^13.3.0", "@rollup/plugin-virtual": "^2.1.0", @@ -296,21 +296,21 @@ } }, "node_modules/@progress/kendo-svg-icons": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@progress/kendo-svg-icons/-/kendo-svg-icons-2.1.0.tgz", - "integrity": "sha512-zAwxw8lt5xlIBMoE3uwUX2Z2RI5njWViYxdFoinvr5d8WJ6kU3sghNONsRelM9GiDd2vbSg0IkEN8dOrBvFjPg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@progress/kendo-svg-icons/-/kendo-svg-icons-2.3.0.tgz", + "integrity": "sha512-VB4x1o6eVoYcCgTDBMkV88giGXsDlyCEJAMFLd9x99oJlmufx4KC6/bzehFn3CXdTcvhw0ONlTm3H8gM9ZH6JQ==", "dev": true }, "node_modules/@progress/kendo-theme-bootstrap": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@progress/kendo-theme-bootstrap/-/kendo-theme-bootstrap-7.2.1.tgz", - "integrity": "sha512-lQcx6z9zKxtXwR5BtvSe4ZPs/TWxWzNNzvyh7ke5EekanWU8q1AY+7wntM6q6D7haWBdbAtqe0odmUiSaG2C8w==", + "version": "8.0.0-dev.8", + "resolved": "https://registry.npmjs.org/@progress/kendo-theme-bootstrap/-/kendo-theme-bootstrap-8.0.0-dev.8.tgz", + "integrity": "sha512-lxSC7JDwDuVCSh06wNCV2TAGZwkzMBQ6QYEJPa3Gl2YokXZPBveZHyvW63GAK4c1WtCqqVRAmPaL344lcgD+3Q==", "dev": true, "dependencies": { - "@progress/kendo-svg-icons": "2.1.0", - "@progress/kendo-theme-core": "7.2.1", - "@progress/kendo-theme-default": "7.2.1", - "@progress/kendo-theme-utils": "7.2.1", + "@progress/kendo-svg-icons": "2.3.0", + "@progress/kendo-theme-core": "8.0.0-dev.8", + "@progress/kendo-theme-default": "8.0.0-dev.8", + "@progress/kendo-theme-utils": "8.0.0-dev.8", "bootstrap": "5.2.1" } }, @@ -334,64 +334,64 @@ } }, "node_modules/@progress/kendo-theme-classic": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@progress/kendo-theme-classic/-/kendo-theme-classic-7.2.1.tgz", - "integrity": "sha512-rooEjgCN1JRizVHLMl4juHgelCIzLFPpKy9qIsCoBLNvpch2DPbA0pMogLy4ifZmw2hPKORPAeMDg/YP6TsSjg==", + "version": "8.0.0-dev.8", + "resolved": "https://registry.npmjs.org/@progress/kendo-theme-classic/-/kendo-theme-classic-8.0.0-dev.8.tgz", + "integrity": "sha512-Q7DO4iWTqA7d6Kuh2EkGPtcV5UDyY49UYKLmDV4urNV/xL1N5AIOlo9cNcP5YdLZDY98SlaHSs+ZESfwZbGrvQ==", "dev": true, "dependencies": { - "@progress/kendo-svg-icons": "2.1.0", - "@progress/kendo-theme-core": "7.2.1", - "@progress/kendo-theme-default": "7.2.1", - "@progress/kendo-theme-utils": "7.2.1" + "@progress/kendo-svg-icons": "2.3.0", + "@progress/kendo-theme-core": "8.0.0-dev.8", + "@progress/kendo-theme-default": "8.0.0-dev.8", + "@progress/kendo-theme-utils": "8.0.0-dev.8" } }, "node_modules/@progress/kendo-theme-core": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@progress/kendo-theme-core/-/kendo-theme-core-7.2.1.tgz", - "integrity": "sha512-fv6ELPjmQWw5p7ksv96RIiSWMQKenXdkK6b96vSakoQcexR/4oKDgbEXnApxeLgTUimh8Hp8M+6JIoZm+EQhyA==", + "version": "8.0.0-dev.8", + "resolved": "https://registry.npmjs.org/@progress/kendo-theme-core/-/kendo-theme-core-8.0.0-dev.8.tgz", + "integrity": "sha512-GD1E8GdFw9Yd/LdLQPV6yfkxSzeaNxnnhVLIjpyNh7a1j+VBumKprNFK89iy+8cAEMDbBnCxxGKdSBdpVIobwg==", "dev": true }, "node_modules/@progress/kendo-theme-default": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@progress/kendo-theme-default/-/kendo-theme-default-7.2.1.tgz", - "integrity": "sha512-WUMg+GZKpP37WL0aeGRi3i8vNmfEJdb5nHVBWAZeuEi/AS8cycVOCwcdDK4NywK9bUI/I0eUvLToxydLOHv6Pg==", + "version": "8.0.0-dev.8", + "resolved": "https://registry.npmjs.org/@progress/kendo-theme-default/-/kendo-theme-default-8.0.0-dev.8.tgz", + "integrity": "sha512-PJvmC1gnk3lad6mtU9ZwKBbZU2jQcNLLXrUj4L5rbb5jaCzikmufYBu+W+a8h3ZQ+6Fptp1nYpzeVfMCv1++Jw==", "dev": true, "dependencies": { - "@progress/kendo-svg-icons": "2.1.0", - "@progress/kendo-theme-core": "7.2.1", - "@progress/kendo-theme-utils": "7.2.1" + "@progress/kendo-svg-icons": "2.3.0", + "@progress/kendo-theme-core": "8.0.0-dev.8", + "@progress/kendo-theme-utils": "8.0.0-dev.8" } }, "node_modules/@progress/kendo-theme-fluent": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@progress/kendo-theme-fluent/-/kendo-theme-fluent-7.2.1.tgz", - "integrity": "sha512-H8djj+s5lgowTNnTao+e3nsiXp6kiQENHhjpNumwAXC0WJcep8GrOY62lQFWmsrSbE+rN+OW5MWewORDoPffiA==", + "version": "8.0.0-dev.8", + "resolved": "https://registry.npmjs.org/@progress/kendo-theme-fluent/-/kendo-theme-fluent-8.0.0-dev.8.tgz", + "integrity": "sha512-eYw7qWl8sivHW79a6ETdQ7DyMeayObQTMc+SXhpnT7coBVlaeXWDOWIyVeOjuKYKu97rqjin9+9w4SsZEqq1qw==", "dev": true, "dependencies": { - "@progress/kendo-svg-icons": "2.1.0", - "@progress/kendo-theme-core": "7.2.1", - "@progress/kendo-theme-utils": "7.2.1" + "@progress/kendo-svg-icons": "2.3.0", + "@progress/kendo-theme-core": "8.0.0-dev.8", + "@progress/kendo-theme-utils": "8.0.0-dev.8" } }, "node_modules/@progress/kendo-theme-material": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@progress/kendo-theme-material/-/kendo-theme-material-7.2.1.tgz", - "integrity": "sha512-mXKHb2qkzBjk0UyYKSZYYz5HVCh6Yd0o9z1eE7YzmZPCdDwbb+5wosFMpAgn2agNQh8uI5YlKV48yaoyWkCy5w==", + "version": "8.0.0-dev.8", + "resolved": "https://registry.npmjs.org/@progress/kendo-theme-material/-/kendo-theme-material-8.0.0-dev.8.tgz", + "integrity": "sha512-aeO9wMov6x8EPJYJg8odOn97S69jM/2cAnek/xMVg9eGCLII/xK61QfrSTThwl9t99u6xPOMAmpsjrWZSbcrTA==", "dev": true, "dependencies": { - "@progress/kendo-svg-icons": "2.1.0", - "@progress/kendo-theme-core": "7.2.1", - "@progress/kendo-theme-default": "7.2.1", - "@progress/kendo-theme-utils": "7.2.1" + "@progress/kendo-svg-icons": "2.3.0", + "@progress/kendo-theme-core": "8.0.0-dev.8", + "@progress/kendo-theme-default": "8.0.0-dev.8", + "@progress/kendo-theme-utils": "8.0.0-dev.8" } }, "node_modules/@progress/kendo-theme-utils": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@progress/kendo-theme-utils/-/kendo-theme-utils-7.2.1.tgz", - "integrity": "sha512-2IzRoBkjb2yolzJoQBZcsccmHT5a6GDw52O/PBXZHsxc5Cir7ej9CjP3tO2O4rWRg+8GfNEzB5XpwUb54lLF0Q==", + "version": "8.0.0-dev.8", + "resolved": "https://registry.npmjs.org/@progress/kendo-theme-utils/-/kendo-theme-utils-8.0.0-dev.8.tgz", + "integrity": "sha512-ugjraLSmZlIuZw/bhPu0wHzhJVRuCDxWBcOT9rANO7F67w4+mCSQxWtY8OwEViSecXwmfWqte2LSXwq/KYIBQw==", "dev": true, "dependencies": { - "@progress/kendo-theme-core": "7.2.1" + "@progress/kendo-theme-core": "8.0.0-dev.8" } }, "node_modules/@progress/wct-a11y-spec": { diff --git a/package.json b/package.json index 8edcfde8ee7..e9d481bfba3 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,14 @@ "license": "Apache-2.0", "version": "1.0.0", "devDependencies": { - "@progress/kendo-svg-icons": "2.1.0", - "@progress/kendo-theme-bootstrap": "7.2.1", - "@progress/kendo-theme-classic": "7.2.1", - "@progress/kendo-theme-core": "7.2.1", - "@progress/kendo-theme-default": "7.2.1", - "@progress/kendo-theme-fluent": "7.2.1", - "@progress/kendo-theme-material": "7.2.1", - "@progress/kendo-theme-utils": "7.2.1", + "@progress/kendo-svg-icons": "2.3.0", + "@progress/kendo-theme-bootstrap": "8.0.0-dev.8", + "@progress/kendo-theme-classic": "8.0.0-dev.8", + "@progress/kendo-theme-core": "8.0.0-dev.8", + "@progress/kendo-theme-default": "8.0.0-dev.8", + "@progress/kendo-theme-fluent": "8.0.0-dev.8", + "@progress/kendo-theme-material": "8.0.0-dev.8", + "@progress/kendo-theme-utils": "8.0.0-dev.8", "@progress/wct-a11y-spec": "^2.0.9", "@rollup/plugin-node-resolve": "^13.3.0", "@rollup/plugin-virtual": "^2.1.0", diff --git a/src/kendo.autocomplete.js b/src/kendo.autocomplete.js index 4465aa7abe7..a61bb51b0ba 100644 --- a/src/kendo.autocomplete.js +++ b/src/kendo.autocomplete.js @@ -236,6 +236,11 @@ var __meta__ = { } }, + _popup: function() { + List.fn._popup.call(this); + this.popup.element.addClass("k-autocomplete-popup"); + }, + _dataSource: function() { var that = this; @@ -863,7 +868,6 @@ var __meta__ = { if (this.options.clearButton) { this._clear.insertAfter(this.element); - this.wrapper.addClass("k-autocomplete-clearable"); } }, diff --git a/src/kendo.dropdownlist.js b/src/kendo.dropdownlist.js index 44915a348fe..9eaaeeba109 100644 --- a/src/kendo.dropdownlist.js +++ b/src/kendo.dropdownlist.js @@ -908,6 +908,7 @@ var __meta__ = { _popup: function() { Select.fn._popup.call(this); + this.popup.element.addClass("k-dropdownlist-popup"); this.popup.one("open", this._popupOpen.bind(this)); }, diff --git a/src/kendo.floatinglabel.js b/src/kendo.floatinglabel.js index 08a5f5c8a38..a87f9d9a931 100644 --- a/src/kendo.floatinglabel.js +++ b/src/kendo.floatinglabel.js @@ -74,7 +74,7 @@ var __meta__ = { var element = that.element; var inputInner = that.options.widget.wrapper.find(".k-input-inner"); if (inputInner.length > 0) { - var labelHeight = that.element.find("> .k-input-label").height(); + var labelHeight = that.element.find("> .k-floating-label").height(); var offsetX = inputInner.position().left + Number.parseInt(inputInner.css('padding-left')); var offsetY = inputInner.position().top + Number.parseInt(inputInner.css('padding-top')) + labelHeight; element[0].style.setProperty(FLOATINGLABEL_OFFSET_X, offsetX + "px"); diff --git a/src/kendo.html.chip.js b/src/kendo.html.chip.js index ef7f3759673..b172097a823 100644 --- a/src/kendo.html.chip.js +++ b/src/kendo.html.chip.js @@ -97,12 +97,12 @@ var __meta__ = { if (options.actions && options.actions.length > 0) { for (var i = 0; i < options.actions.length; i++) { var action = options.actions[i]; - that.actionsWrapper.append($(`${kendo.ui.icon({ icon: action.icon, iconClass: "k-chip-icon", size: "small" })}`).attr(action.attr ? action.attr : {})); + that.actionsWrapper.append($(`${kendo.ui.icon({ icon: action.icon, size: "small" })}`).attr(action.attr ? action.attr : {})); } } if (options.removable) { - that.actionsWrapper.append($(`${kendo.ui.icon({ icon: options.removeIcon, iconClass: "k-chip-icon", size: "small" })}`).attr(options.removableAttr)); + that.actionsWrapper.append($(`${kendo.ui.icon({ icon: options.removeIcon, size: "small" })}`).attr(options.removableAttr)); } } }); diff --git a/src/kendo.label.js b/src/kendo.label.js index 246105392e5..bfb3a113650 100644 --- a/src/kendo.label.js +++ b/src/kendo.label.js @@ -17,6 +17,7 @@ const Widget = ui.Widget; const isFunction = kendo.isFunction; const LABELCLASSES = "k-label k-input-label"; +const FLOATINGLABELCLASS = "k-floating-label"; var Label = Widget.extend({ options: { @@ -79,10 +80,6 @@ var Label = Widget.extend({ } that._label(); - - if (that.floatingLabel) { - that.floatingLabel.refresh(); - } }, _label: function() { @@ -91,6 +88,7 @@ var Label = Widget.extend({ var options = that.options; var id = element.attr("id"); var labelText = options.content; + var floating = options.floating || false; if (isFunction(labelText)) { labelText = labelText.call(that); @@ -105,10 +103,14 @@ var Label = Widget.extend({ element.attr("id", id); } - that.element.addClass(LABELCLASSES) + that.element.addClass(floating ? FLOATINGLABELCLASS : LABELCLASSES) .attr("for", id) .text(labelText) - .insertBefore(that.options.beforeElm || that.widget.wrapper); + [floating ? "insertAfter" : "insertBefore"](that.options.beforeElm || that.widget.wrapper); + + if (that.floatingLabel) { + that.floatingLabel.refresh(); + } }, _floatingLabel: function() { diff --git a/src/kendo.list.js b/src/kendo.list.js index e35664688cb..c8fd6d7413e 100644 --- a/src/kendo.list.js +++ b/src/kendo.list.js @@ -245,6 +245,7 @@ var __meta__ = { })); that._inputLabel = that.label.element; + that._refreshFloatingLabel(); }, _floatCheck: function() { diff --git a/src/kendo.maskedtextbox.js b/src/kendo.maskedtextbox.js index 15a5c516dac..2dbe28784a7 100644 --- a/src/kendo.maskedtextbox.js +++ b/src/kendo.maskedtextbox.js @@ -24,6 +24,7 @@ var __meta__ = { var setTimeout = window.setTimeout; var LABELCLASSES = "k-label k-input-label"; + var FLOATINGLABELCLASS = "k-floating-label"; var STATEDISABLED = "k-disabled"; var STATEINVALID = "k-invalid"; var FOCUSED = "k-focus"; @@ -635,7 +636,7 @@ var __meta__ = { element.attr("id", id); } - that._inputLabel = $("'").insertBefore(that.wrapper); + that._inputLabel = $("'")[floating ? "insertAfter" : "insertBefore"](that.wrapper); } }, diff --git a/src/kendo.numerictextbox.js b/src/kendo.numerictextbox.js index 4b0bcafa709..cb8a3fdc287 100644 --- a/src/kendo.numerictextbox.js +++ b/src/kendo.numerictextbox.js @@ -41,6 +41,7 @@ var __meta__ = { SYMBOL = "symbol", CLASS_ICON = "k-icon", LABELCLASSES = "k-label k-input-label", + FLOATINGLABELCLASS = "k-floating-label", SELECTED = "k-selected", STATEDISABLED = "k-disabled", STATEINVALID = "k-invalid", @@ -919,7 +920,7 @@ var __meta__ = { element.attr("id", id); } - that._inputLabel = $("'").insertBefore(that.wrapper); + that._inputLabel = $("'")[floating ? "insertAfter" : "insertBefore"](that.wrapper); if ((that.element.attr("disabled") === undefined) && (that.element.attr("readonly") === undefined)) { that._inputLabel.on("click" + ns, that.focus.bind(that)); diff --git a/src/kendo.textarea.js b/src/kendo.textarea.js index e023f10426d..e9c40ee3736 100644 --- a/src/kendo.textarea.js +++ b/src/kendo.textarea.js @@ -22,6 +22,7 @@ var __meta__ = { INPUT = "k-input-inner", FOCUSED = "k-focus", LABELCLASSES = "k-label k-input-label", + FLOATINGLABELCLASS = "k-floating-label", STATEDISABLED = "k-disabled", STATEREADONLY = "k-readonly", ARIA_DISABLED = "aria-disabled", @@ -271,7 +272,7 @@ var __meta__ = { element.attr("id", id); } - that._inputLabel = $("'").insertBefore(that.wrapper); + that._inputLabel = $("'")[floating ? "insertAfter" : "insertBefore"](that.wrapper); } }, diff --git a/src/kendo.textbox.js b/src/kendo.textbox.js index e778e5dfe1e..44166c2ef13 100644 --- a/src/kendo.textbox.js +++ b/src/kendo.textbox.js @@ -24,6 +24,7 @@ var __meta__ = { INPUT_EV = "input", FOCUSED = "k-focus", LABELCLASSES = "k-label k-input-label", + FLOATINGLABELCLASS = "k-floating-label", STATEDISABLED = "k-disabled", STATEREADONLY = "k-readonly", ARIA_DISABLED = "aria-disabled"; @@ -243,8 +244,7 @@ var __meta__ = { id = options.name + "_" + kendo.guid(); element.attr("id", id); } - - that._inputLabel = $("'").insertBefore(that.wrapper); + that._inputLabel = $("'")[floating ? "insertAfter" : "insertBefore"](that.wrapper); } }, diff --git a/typescript/kendo.all.d.ts b/typescript/kendo.all.d.ts index 303e8adaf00..202d124d2b9 100644 --- a/typescript/kendo.all.d.ts +++ b/typescript/kendo.all.d.ts @@ -5126,10 +5126,20 @@ declare namespace kendo.ui { title?: string | undefined; } + interface EditorResizableMin { + minWidth?: number; + minHeight?: number; + } + + interface EditorResizableMax { + maxWidth?: number; + maxHeight?: number; + } + interface EditorResizable { content?: boolean | undefined; - min?: number | undefined; - max?: number | undefined; + min?: number | EditorResizableMin | undefined; + max?: number | EditorResizableMax | undefined; toolbar?: boolean | undefined; }