Skip to content

Commit 7531bf3

Browse files
kendo-botkendo-bot
committed
Sync with Kendo UI Professional
1 parent aa8c9d2 commit 7531bf3

18 files changed

+250
-354
lines changed

‎src/kendo.calendar.js‎

Lines changed: 53 additions & 59 deletions
Large diffs are not rendered by default.

‎src/kendo.panelbar.js‎

Lines changed: 30 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -24,41 +24,37 @@ var __meta__ = {
2424
NS = ".kendoPanelBar",
2525
IMG = "img",
2626
HREF = "href",
27-
LAST = "k-last",
2827
LINK = "k-link",
2928
LINKSELECTOR = "." + LINK,
3029
ERROR = "error",
3130
ITEM = ".k-panelbar-item",
32-
GROUP = ".k-group",
31+
GROUP = ".k-panelbar-group",
3332
VISIBLEGROUP = GROUP + ":visible",
3433
IMAGE = "k-image",
35-
FIRST = "k-first",
3634
CHANGE = "change",
3735
EXPAND = "expand",
3836
SELECT = "select",
3937
CLICK = "click",
40-
CONTENT = "k-content",
38+
CONTENT = "k-panelbar-content",
4139
ACTIVATE = "activate",
4240
COLLAPSE = "collapse",
4341
DATABOUND = "dataBound",
4442
MOUSEENTER = "mouseenter",
4543
MOUSELEAVE = "mouseleave",
4644
CONTENTLOAD = "contentLoad",
4745
UNDEFINED = "undefined",
48-
ACTIVECLASS = "k-active",
4946
EXPANDEDCLASS = "k-expanded",
50-
GROUPS = "> .k-panel",
51-
CONTENTS = "> .k-content",
47+
GROUPS = "> .k-panelbar-group",
48+
CONTENTS = "> .k-panelbar-content",
5249
STRING = "string",
5350
FOCUSEDCLASS = "k-focus",
5451
DISABLEDCLASS = "k-disabled",
5552
SELECTEDCLASS = "k-selected",
5653
SELECTEDSELECTOR = "." + SELECTEDCLASS,
57-
HIGHLIGHTCLASS = "k-highlight",
5854
ACTIVEITEMSELECTOR = ITEM + ":not(.k-disabled)",
59-
clickableItems = "> " + ACTIVEITEMSELECTOR + " > " + LINKSELECTOR + ", .k-panel > " + ACTIVEITEMSELECTOR + " > " + LINKSELECTOR,
55+
clickableItems = "> " + ACTIVEITEMSELECTOR + " > " + LINKSELECTOR + ", .k-panelbar-group > " + ACTIVEITEMSELECTOR + " > " + LINKSELECTOR,
6056
disabledItems = ITEM + ".k-disabled > .k-link",
61-
selectableItems = "> li > " + SELECTEDSELECTOR + ", .k-panel > li > " + SELECTEDSELECTOR,
57+
selectableItems = "> li > " + SELECTEDSELECTOR + ", .k-panelbar-group > li > " + SELECTEDSELECTOR,
6258
ARIA_DISABLED = "aria-disabled",
6359
ARIA_EXPANDED = "aria-expanded",
6460
ARIA_HIDDEN = "aria-hidden",
@@ -99,18 +95,9 @@ var __meta__ = {
9995
if (item.enabled === false) {
10096
result += " " + DISABLEDCLASS;
10197
} else if (item.expanded === true) {
102-
result += " " + ACTIVECLASS;
10398
result += " " + EXPANDEDCLASS;
10499
}
105100

106-
if (index === 0) {
107-
result += " k-first";
108-
}
109-
110-
if (index == group.length - 1) {
111-
result += " k-last";
112-
}
113-
114101
if (item.cssClass) {
115102
result += " " + item.cssClass;
116103
}
@@ -150,7 +137,7 @@ var __meta__ = {
150137
return group.expanded !== true;
151138
},
152139
groupCssClass: function() {
153-
return "k-panelbar-group k-group k-panel";
140+
return "k-panelbar-group";
154141
},
155142
contentAttributes: function(content) {
156143
return content.item.expanded !== true ? ` ${kendo.attr("style-display")}="none"` : "";
@@ -163,15 +150,6 @@ var __meta__ = {
163150
}
164151
};
165152

166-
function updateFirstLast(items) {
167-
items = $(items);
168-
169-
items.filter(".k-first:not(:first-child)").removeClass(FIRST);
170-
items.filter(".k-last:not(:last-child)").removeClass(LAST);
171-
items.filter(":first-child").addClass(FIRST);
172-
items.filter(":last-child").addClass(LAST);
173-
}
174-
175153
function updateLevel(item) {
176154
item = $(item);
177155

@@ -213,7 +191,7 @@ var __meta__ = {
213191

214192
Widget.fn.init.call(that, element, options);
215193

216-
element = that.wrapper = that.element.addClass("k-panelbar k-pos-relative");
194+
element = that.wrapper = that.element.addClass("k-panelbar");
217195
options = that.options;
218196

219197
if (element[0].id) {
@@ -249,7 +227,7 @@ var __meta__ = {
249227
})
250228
.attr("role", "tree");
251229

252-
content = element.find("li." + ACTIVECLASS + " > ." + CONTENT);
230+
content = element.find("li." + EXPANDEDCLASS + " > ." + CONTENT);
253231

254232
if (content[0]) {
255233
that.expand(content.parent(), false);
@@ -337,7 +315,7 @@ var __meta__ = {
337315

338316
that.templates = {
339317
content: template(
340-
({ data, item, contentAttributes, content }) => `<div class='k-panelbar-content k-content'${contentAttributes({ data, item, contentAttributes, content })}>${content(item)}</div>`
318+
({ data, item, contentAttributes, content }) => `<div class='k-panelbar-content'${contentAttributes({ data, item, contentAttributes, content })}>${content(item)}</div>`
341319
),
342320
group: template( ({ data, items, group, renderItems, panelBar, ariaHidden, groupCssClass, groupAttributes }) =>
343321
`<ul role='group' aria-hidden='${ariaHidden(group)}' class='${groupCssClass(group)}' ${groupAttributes(group)}>` +
@@ -417,7 +395,7 @@ var __meta__ = {
417395

418396
element.each(function(index, item) {
419397
item = $(item);
420-
var wrapper = element.children(".k-group,.k-content");
398+
var wrapper = element.children(".k-panelbar-group,.k-panelbar-content");
421399

422400
if (!wrapper.length) {
423401
wrapper = that._addGroupElement(element);
@@ -431,9 +409,6 @@ var __meta__ = {
431409
return that;
432410
}
433411

434-
element.find("." + HIGHLIGHTCLASS).removeClass(HIGHLIGHTCLASS);
435-
item.addClass(HIGHLIGHTCLASS);
436-
437412
if (!useAnimation) {
438413
animBackup = that.options.animation;
439414
that.options.animation = { expand: { effects: {} }, collapse: { hide: true, effects: {} } };
@@ -466,7 +441,6 @@ var __meta__ = {
466441
var groups = item.find(GROUPS).add(item.find(CONTENTS));
467442

468443
if (!item.hasClass(DISABLEDCLASS) && groups.is(VISIBLE)) {
469-
item.removeClass(HIGHLIGHTCLASS);
470444

471445
if (!useAnimation) {
472446
animBackup = that.options.animation;
@@ -497,8 +471,8 @@ var __meta__ = {
497471
var dataItem = that.dataItem(this);
498472

499473
if (!dataItem) {
500-
return $(this).find(".k-panel").length > 0 ||
501-
$(this).find(".k-content").length > 0;
474+
return $(this).find(".k-panelbar-group").length > 0 ||
475+
$(this).find(".k-panelbar-content").length > 0;
502476
}
503477

504478
return dataItem.hasChildren || dataItem.content || dataItem.contentUrl;
@@ -508,8 +482,8 @@ var __meta__ = {
508482
var item = $(this),
509483
parent = item.parent();
510484
let icon = kendo.ui.icon({
511-
icon: parent.hasClass(ACTIVECLASS) ? "chevron-up" : "chevron-down",
512-
iconClass: `k-panelbar-toggle k-panelbar-${parent.hasClass(ACTIVECLASS) ? "collapse" : "expand" }`
485+
icon: parent.hasClass(EXPANDEDCLASS) ? "chevron-up" : "chevron-down",
486+
iconClass: `k-panelbar-toggle k-panelbar-${parent.hasClass(EXPANDEDCLASS) ? "collapse" : "expand" }`
513487
});
514488

515489
item.append(icon);
@@ -603,18 +577,18 @@ var __meta__ = {
603577
_refreshChildren: function(item, parentNode) {
604578
var i, children, child;
605579

606-
parentNode.children(".k-group").empty();
580+
parentNode.children(".k-panelbar-group").empty();
607581
var items = item.children.data();
608582
if (!items.length) {
609583
updateItemHtml(parentNode);
610-
children = parentNode.children(".k-group").children("li");
584+
children = parentNode.children(".k-panelbar-group").children("li");
611585
} else {
612586
this.append(item.children, parentNode);
613587

614588
if (this.options.loadOnDemand) {
615-
this._toggleGroup(parentNode.children(".k-group"), false);
589+
this._toggleGroup(parentNode.children(".k-panelbar-group"), false);
616590
}
617-
children = parentNode.children(".k-group").children("li");
591+
children = parentNode.children(".k-panelbar-group").children("li");
618592

619593
for (i = 0; i < children.length; i++) {
620594
child = children.eq(i);
@@ -797,7 +771,7 @@ var __meta__ = {
797771
children = parentNode.children("li");
798772
wrapper = parentNode;
799773
} else {
800-
wrapper = parentNode.children(".k-group");
774+
wrapper = parentNode.children(".k-panelbar-group");
801775
if (!wrapper.length) {
802776
wrapper = that._addGroupElement(parentNode);
803777
}
@@ -872,7 +846,7 @@ var __meta__ = {
872846
if (render) {
873847
context.group = {
874848
firstLevel: node.hasClass("k-panelbar"),
875-
expanded: nodeWrapper.parent().hasClass(ACTIVECLASS),
849+
expanded: nodeWrapper.parent().hasClass(EXPANDEDCLASS),
876850
length: nodeWrapper.children().length
877851
};
878852

@@ -967,12 +941,10 @@ var __meta__ = {
967941

968942
each(inserted.items, function() {
969943
inserted.group.append(this);
970-
updateFirstLast(this);
971944
updateLevel(this);
972945
});
973946

974947
this.updateArrow(referenceItem);
975-
updateFirstLast(inserted.group.find(".k-first, .k-last"));
976948
inserted.group.height("auto");
977949

978950
return this;
@@ -985,11 +957,9 @@ var __meta__ = {
985957

986958
each(inserted.items, function() {
987959
referenceItem.before(this);
988-
updateFirstLast(this);
989960
updateLevel(this);
990961
});
991962

992-
updateFirstLast(referenceItem);
993963
inserted.group.height("auto");
994964

995965
return this;
@@ -1002,11 +972,9 @@ var __meta__ = {
1002972

1003973
each(inserted.items, function() {
1004974
referenceItem.after(this);
1005-
updateFirstLast(this);
1006975
updateLevel(this);
1007976
});
1008977

1009-
updateFirstLast(referenceItem);
1010978
inserted.group.height("auto");
1011979

1012980
return this;
@@ -1029,7 +997,6 @@ var __meta__ = {
1029997
parent = parent.eq(0);
1030998

1031999
that.updateArrow(parent);
1032-
updateFirstLast(parent);
10331000
}
10341001

10351002
return that;
@@ -1130,7 +1097,7 @@ var __meta__ = {
11301097
next = item.nextAll(":visible").first();
11311098

11321099
if (group[0]) {
1133-
next = group.children("." + FIRST);
1100+
next = group.children().first();
11341101
}
11351102

11361103
if (!next[0]) {
@@ -1160,7 +1127,7 @@ var __meta__ = {
11601127
} else {
11611128
result = prev;
11621129
while (result[0]) {
1163-
result = result.children(VISIBLEGROUP).children("." + LAST);
1130+
result = result.children(VISIBLEGROUP).children().last();
11641131
if (result[0]) {
11651132
prev = result;
11661133
}
@@ -1183,7 +1150,7 @@ var __meta__ = {
11831150

11841151
groupData = {
11851152
firstLevel: parent.hasClass("k-panelbar"),
1186-
expanded: $(referenceItem).hasClass(ACTIVECLASS),
1153+
expanded: $(referenceItem).hasClass(EXPANDEDCLASS),
11871154
length: parent.children().length
11881155
};
11891156

@@ -1218,7 +1185,7 @@ var __meta__ = {
12181185
dataItem.hasChildren = true;
12191186
referenceItem
12201187
.attr(ARIA_EXPANDED, dataItem.expanded)
1221-
.not("." + ACTIVECLASS)
1188+
.not("." + EXPANDEDCLASS)
12221189
.children("ul")
12231190
.attr(ARIA_HIDDEN, !dataItem.expanded);
12241191
} else {
@@ -1256,7 +1223,7 @@ var __meta__ = {
12561223
panels = that.element
12571224
.find("li > ul")
12581225
.not(function() { return $(this).parentsUntil(".k-panelbar", "div").length; })
1259-
.addClass("k-panelbar-group k-group k-panel")
1226+
.addClass("k-panelbar-group")
12601227
.attr("role", "group");
12611228

12621229
panelsParent = panels.parent();
@@ -1266,7 +1233,7 @@ var __meta__ = {
12661233
panels.parent()
12671234
.not("[" + ARIA_EXPANDED + "]")
12681235
.attr(ARIA_EXPANDED, expanded)
1269-
.not("." + ACTIVECLASS)
1236+
.not("." + EXPANDEDCLASS)
12701237
.children("ul")
12711238
.attr(ARIA_HIDDEN, !expanded)
12721239
.hide();
@@ -1275,7 +1242,6 @@ var __meta__ = {
12751242

12761243
that._updateItemsClasses(items);
12771244
that.updateArrow(items);
1278-
updateFirstLast(items);
12791245
},
12801246

12811247
_updateItemsClasses: function(items) {
@@ -1394,7 +1360,7 @@ var __meta__ = {
13941360

13951361
that._updateSelected(link);
13961362

1397-
var wrapper = item.children(".k-group,.k-content");
1363+
var wrapper = item.children(".k-panelbar-group,.k-panelbar-content");
13981364
var dataItem = this.dataItem(item);
13991365

14001366
if (!wrapper.length && ((that.options.loadOnDemand && dataItem && dataItem.hasChildren) ||
@@ -1465,7 +1431,7 @@ var __meta__ = {
14651431
this._progress(element, true);
14661432
}
14671433

1468-
element.children(".k-group,.k-content").remove();
1434+
element.children(".k-panelbar-group,.k-panelbar-content").remove();
14691435
prevent = dataItem.hasChildren;
14701436

14711437
dataItem.load();
@@ -1515,7 +1481,6 @@ var __meta__ = {
15151481

15161482
element.parent()
15171483
.attr(ARIA_EXPANDED, !visibility)
1518-
.toggleClass(ACTIVECLASS, !visibility)
15191484
.toggleClass(EXPANDEDCLASS, !visibility)
15201485
.find("> .k-link > .k-panelbar-collapse,> .k-link > .k-panelbar-expand")
15211486
.each(function(ind, el) {
@@ -1552,7 +1517,7 @@ var __meta__ = {
15521517
},
15531518

15541519
_addGroupElement: function(element) {
1555-
var group = $('<ul role="group" aria-hidden="true" class="k-panelbar-group k-group k-panel"></ul>').hide();
1520+
var group = $('<ul role="group" aria-hidden="true" class="k-panelbar-group"></ul>').hide();
15561521

15571522
element.append(group);
15581523
return group;
@@ -1673,10 +1638,8 @@ var __meta__ = {
16731638
that._selected = item.attr(ARIA_SELECTED, true);
16741639

16751640
element.find(selectableItems).removeClass(SELECTEDCLASS);
1676-
element.find("> ." + HIGHLIGHTCLASS + ", .k-panel > ." + HIGHLIGHTCLASS).removeClass(HIGHLIGHTCLASS);
16771641

16781642
link.addClass(SELECTEDCLASS);
1679-
link.parentsUntil(element, ITEM).filter(":has(.k-link)").addClass(HIGHLIGHTCLASS);
16801643
that._current(item[0] ? item : null);
16811644
if (dataItem) {
16821645
dataItem.set("selected", true);

0 commit comments

Comments
 (0)