Skip to content

Commit 8029534

Browse files
committed
Sync with Kendo UI Professional
1 parent 194f57e commit 8029534

File tree

8 files changed

+1164
-799
lines changed

8 files changed

+1164
-799
lines changed

docs-aspnet/html-helpers/editors/editor/image-browser.md

Lines changed: 1139 additions & 791 deletions
Large diffs are not rendered by default.
19 KB
Loading
88.7 KB
Loading
12.9 KB
Loading
19.3 KB
Loading

docs-aspnet/html-helpers/editors/editor/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ The example below illustrates how to bind the Editor to a Model property that is
190190
| [Tools]({% slug htmlhelpers_editor_tools_aspnetcore %})| The Editor allows you to enable a large set of built-in text editing tools. You can also add your custom tools. |
191191
| [Pasting content]({% slug htmlhelpers_editor_pasting_aspnetcore %})| The users can paste content from HTML and Microsoft Word documents into the Editor.|
192192
| [Serializing and deserializing content]({% slug htmlhelpers_editor_serialize_aspnetcore %})| You can configure custom definitions for serializing and deserializing of the Editor's content.|
193-
| [Image browser]({% slug htmlhelpers_editor_image_browser_aspnetcore %})| The Editor allows the user to insert an image by browsing a list of predefined files and directories.|
193+
| [Image and File Browser]({% slug htmlhelpers_editor_image_browser_aspnetcore %})| The Editor allows the user to insert images and files by browsing a list of predefined files and directories.|
194194
| [Immutable elements]({% slug htmlhelpers_editor_immutable_aspnetcore %})| By using the immutable feature, the Editor allows you to add HTML elements that cannot be edited by the user.|
195195
| [CRUD operations]({% slug htmlhelpers_crud_editor_aspnetcore %})| The Editor docs and demos demonstrate how to save, read, update, and delete text content in a database.|
196196
| [Styling the content]({% slug htmlhelpers_editor_styling_aspnetcore %})| You can choose between the default styling options for the Editor's content or add your custom styles.|

src/kendo.splitter.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ export const __meta__ = {
574574
sizedPanesCount++;
575575
sizedPanesWidth += size;
576576
panesSizes.push(size);
577+
element.css(sizingProperty, "");
577578
element.css(PANE_SIZING_PROP, size + PX);
578579
return size;
579580
});
@@ -607,7 +608,8 @@ export const __meta__ = {
607608
}).last();
608609

609610
if (lastNonCollapsedPane.length) {
610-
lastNonCollapsedPane[sizingProperty](totalSize + lastNonCollapsedPane[0][sizingDomProperty]);
611+
const expandTotal = (totalSize + lastNonCollapsedPane[0][sizingDomProperty]);
612+
lastNonCollapsedPane.css(PANE_SIZING_PROP, expandTotal);
611613
}
612614
}
613615

tests/unit/splitter/expandcollapse.js

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,27 @@ describe("splitter collapse", function() {
3131
e.preventDefault();
3232
}
3333
});
34-
35-
splitter.dom.find(".k-i-caret-alt-left").trigger("click");
34+
splitter.dom.find(".k-svg-i-caret-alt-left").trigger("click");
3635

3736
assert.isOk(!splitter.dom.find(".k-pane:first").data("pane").collapsed);
3837
});
3938

39+
it("sized pane with non-sized expand/collapse correctly", function() {
40+
splitter = create({
41+
panes: [{ size: "80px", collapsible: true, resizable: true },
42+
{ collapsible: true, resizable: true }],
43+
});
44+
splitter.dom.find(".k-svg-i-caret-alt-right").trigger("click");
45+
46+
assert.equal(splitter.dom.find(".k-pane").first().width(), 193);
47+
assert.equal(splitter.dom.find(".k-pane").last().width(), 0);
48+
49+
splitter.dom.find(".k-svg-i-caret-alt-left").trigger("click");
50+
51+
assert.equal(splitter.dom.find(".k-pane").first().width(), 80);
52+
assert.equal(splitter.dom.find(".k-pane").last().width(), 113);
53+
});
54+
4055
it("clicking collapse arrow calls splitter.collapse", function() {
4156
let called;
4257

@@ -246,7 +261,7 @@ describe("splitter expand", function() {
246261
splitter.object.collapse(".k-pane:first");
247262

248263
assert.isOk(splitter.dom.find(".k-splitbar").is(":not(.k-splitbar-draggable-horizontal)"));
249-
assert.isOk(!splitter.dom.find(".k-splitbar .k-i-caret-alt-left").length);
264+
assert.isOk(!splitter.dom.find(".k-splitbar .k-svg-i-caret-alt-left").length);
250265
});
251266

252267
it("collapsing pane disables collapsing of previous pane", function() {
@@ -257,7 +272,7 @@ describe("splitter expand", function() {
257272
splitter.object.collapse(".k-pane:last");
258273

259274
assert.isOk(splitter.dom.find(".k-splitbar").is(":not(.k-splitbar-draggable-horizontal)"));
260-
assert.isOk(!splitter.dom.find(".k-splitbar .k-i-caret-alt-right").length);
275+
assert.isOk(!splitter.dom.find(".k-splitbar .k-svg-i-caret-alt-right").length);
261276
});
262277

263278
// The fluid pane should stay as a buffer as it would distort the fixed size of the remaining static panes
@@ -316,7 +331,7 @@ describe("splitter expand", function() {
316331
]
317332
});
318333

319-
splitter.dom.find(".k-i-caret-alt-left")
334+
splitter.dom.find(".k-svg-i-caret-alt-left")
320335
.trigger("mousedown")
321336
.trigger("mouseup")
322337
.trigger("click");
@@ -329,7 +344,7 @@ describe("splitter expand", function() {
329344
panes: [{ collapsible: true }, {}]
330345
});
331346

332-
splitter.dom.find(".k-i-caret-alt-left")
347+
splitter.dom.find(".k-svg-i-caret-alt-left")
333348
.trigger("mousedown");
334349

335350
splitter.dom.find(".k-overlay:first")

0 commit comments

Comments
 (0)