Skip to content

Commit e9ba9e4

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 606c712 commit e9ba9e4

File tree

6 files changed

+42
-4
lines changed

6 files changed

+42
-4
lines changed

docs/api/javascript/spreadsheet/range.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,35 @@ True to make the cell enabled; false to disable it.
454454
</script>
455455
```
456456

457+
### html
458+
459+
Gets or sets the html rendering of the cells in the range.
460+
461+
##### value `Boolean` *optional*
462+
463+
True to make the cell render the value as HTML.
464+
An important thing in this case is to sanitized the value of the cell on the server for passing save html because there is no client-side sanitizing.
465+
466+
> When the value is 'true ' the value of the cell should be always sanitized on the server for passing save html.
467+
468+
#### Returns
469+
470+
`Boolean` the current disabled state of the top-left cell of the range.
471+
472+
#### Example
473+
474+
```
475+
<div id="spreadsheet"></div>
476+
<script type="text/javascript" charset="utf-8">
477+
$("#spreadsheet").kendoSpreadsheet();
478+
var spreadsheet = $("#spreadsheet").data("kendoSpreadsheet");
479+
var sheet = spreadsheet.activeSheet();
480+
sheet.range("A1").value("disabled");
481+
sheet.range("A1").enable(false);
482+
</script>
483+
```
484+
485+
457486
### fillFrom
458487

459488
Fills a range with values inferred from a source range. This method employs some heuristics similar to what Excel's auto-filling algorithm does when you select a range of cells and drag the bottom-right handle. The range to be filled is the current object, and you must pass a source range containing data as first argument.

docs/api/javascript/ui/form.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@ Defines the hint text that will be shown underneath the form editor.
170170

171171
Defines the field size when grid layout is used.
172172

173+
### items.attributes `Object`
174+
175+
Defines the attributes that are applied to the input element.
176+
173177
### orientation `String`
174178

175179
Configures the Form orientation. Available options are `"horizontal"` and `"vertical"`.

docs/api/javascript/ui/spreadsheet.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,11 @@ The format of the cell text. For more information, refer to the article on [crea
992992

993993
The cell formula without the leading equals sign, for example, `A1 * 10`.
994994

995+
### sheets.rows.cells.html `Boolean`
996+
997+
If set to `true`, renders the cell value as HTML.
998+
An important thing in this case is to sanitized the value of the cell on the server for passing save html because there is no client-side sanitizing.
999+
9951000
### sheets.rows.cells.index `Number`
9961001

9971002
The zero-based index of the cell. Required to ensure correct positioning.

src/kendo.dialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
_setElementHeight: function() {
220220
var that = this,
221221
element = that.element,
222-
height = that.options.height,
222+
height = that.wrapper.outerHeight(true),
223223
elementHeight = parseFloat(height, 10) - that._uiHeight();
224224

225225
if (elementHeight < 0) {

src/kendo.editable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ var __meta__ = { // jshint ignore:line
165165
"string": function(container, options) {
166166
var attr = createAttributes(options);
167167

168-
$('<input type="text" class="k-textbox"/>').attr(attr).appendTo(container);
168+
$('<input type="text" />').attr(attr).addClass("k-textbox").appendTo(container);
169169
},
170170
"boolean": function(container, options) {
171171
var attr = createAttributes(options);
172-
$('<input type="checkbox" class="k-checkbox" />').attr(attr).appendTo(container);
172+
$('<input type="checkbox" />').attr(attr).addClass("k-checkbox").appendTo(container);
173173
},
174174
"values": function(container, options) {
175175
var attr = createAttributes(options);

tests/dialog/initialization.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
it("set zero content height by creating dialog with string insufficient height", function() {
202202
var dialog = createDialog({ height: "10px", buttonLayout: "normal" });
203203

204-
assert.equal(dialog.element.prop("style").getPropertyValue("height"), "0px");
204+
assert.equal(dialog.element.height(), 0);
205205
});
206206

207207
it("apply scroll class name to dialog content", function() {

0 commit comments

Comments
 (0)