Skip to content

Commit bbf0062

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 70f1070 commit bbf0062

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"karma-qunit": "^1.2.1",
6666
"karma-spec-reporter": "0.0.32",
6767
"lazypipe": "~1.0.1",
68-
"less": "^3.8.1",
68+
"less": "<3.11.0",
6969
"merge2": "~0.3.6",
7070
"mocha": "^5.2.0",
7171
"optimist": "0.3.7",

src/kendo.menu.js

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ var __meta__ = { // jshint ignore:line
9696
},
9797

9898
rendering = {
99-
wrapperCssClass: function (group, item) {
100-
var result = "k-item",
99+
wrapperCssClass: function(group, item) {
100+
var result = "k-item k-menu-item",
101101
index = item.index;
102102

103103
if (item.enabled === false) {
@@ -110,19 +110,19 @@ var __meta__ = { // jshint ignore:line
110110
result += " k-first";
111111
}
112112

113-
if (index == group.length-1) {
113+
if (index == group.length - 1) {
114114
result += " k-last";
115115
}
116116

117117
if (item.cssClass) {
118118
result += " " + item.cssClass;
119119
}
120120

121-
if(item.attr && item.attr.hasOwnProperty("class")) {
121+
if (item.attr && item.attr.hasOwnProperty("class")) {
122122
result += " " + item.attr["class"];
123123
}
124124

125-
if(item.selected) {
125+
if (item.selected) {
126126
result += " " + SELECTEDSTATE;
127127
}
128128

@@ -186,7 +186,7 @@ var __meta__ = { // jshint ignore:line
186186
},
187187

188188
arrowClass: function(item, group) {
189-
var result = "k-icon";
189+
var result = "k-menu-expand-arrow k-icon";
190190

191191
if (group.horizontal) {
192192
result += " k-i-arrow-60-down";
@@ -242,24 +242,30 @@ var __meta__ = { // jshint ignore:line
242242
}
243243
}
244244

245-
function updateItemClasses (item) {
245+
function updateItemClasses(item) {
246246
item = $(item);
247247

248-
item.addClass("k-item")
248+
item.addClass("k-item k-menu-item")
249249
.children(IMG)
250250
.addClass(IMAGE);
251+
251252
item
252253
.children("a")
253254
.addClass(LINK)
254255
.children(IMG)
255256
.addClass(IMAGE);
257+
256258
item
257259
.filter(":not([disabled])")
258260
.addClass(DEFAULTSTATE);
261+
259262
item
260263
.filter(".k-separator")
264+
.removeClass("k-menu-item")
265+
.addClass("k-menu-separator")
261266
.empty()
262267
.append("&nbsp;");
268+
263269
item
264270
.filter("li[disabled]")
265271
.addClass(DISABLEDSTATE)
@@ -281,7 +287,7 @@ var __meta__ = { // jshint ignore:line
281287
updateFirstLast(item);
282288
}
283289

284-
function updateArrow (item) {
290+
function updateArrow(item) {
285291
item = $(item);
286292

287293
item.find("> .k-link > [class*=k-i-arrow-60]:not(.k-sprite)").remove();
@@ -292,23 +298,23 @@ var __meta__ = { // jshint ignore:line
292298
var item = $(this),
293299
arrowCssClass = getArrowCssClass(item);
294300

295-
item.append("<span class='k-icon" + arrowCssClass + " k-menu-expand-arrow'/>");
301+
item.append("<span class='k-menu-expand-arrow k-icon " + arrowCssClass + "' />");
296302
});
297303
}
298304

299-
function getArrowCssClass (item) {
305+
function getArrowCssClass(item) {
300306
var arrowCssClass,
301307
parent = item.parent().parent(),
302308
isRtl = kendo.support.isRtl(parent);
303309

304310
if (parent.hasClass(MENU + "-horizontal")) {
305-
arrowCssClass = " k-i-arrow-60-down";
311+
arrowCssClass = "k-i-arrow-60-down";
306312
} else {
307313
if (isRtl) {
308-
arrowCssClass = " k-i-arrow-60-left";
314+
arrowCssClass = "k-i-arrow-60-left";
309315
}
310316
else {
311-
arrowCssClass = " k-i-arrow-60-right";
317+
arrowCssClass = "k-i-arrow-60-right";
312318
}
313319
}
314320
return arrowCssClass;

0 commit comments

Comments
 (0)