Skip to content

Commit 70f1070

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

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

src/kendo.draganddrop.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,10 @@ var __meta__ = { // jshint ignore:line
641641
select: proxy(that._select, that)
642642
});
643643

644+
if (kendo.support.touch) {
645+
that.element.css('touch-action', 'none');
646+
}
647+
644648
that._afterEndHandler = proxy(that._afterEnd, that);
645649
that._captureEscape = proxy(that._captureEscape, that);
646650
},

src/kendo.panelbar.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ var __meta__ = { // jshint ignore:line
2828
LAST = "k-last",
2929
LINK = "k-link",
3030
LINKSELECTOR = "." + LINK,
31-
ICONEXPAND = "k-panelbar-expand",
32-
ICONCOLLAPSE = "k-panelbar-collapse",
3331
ERROR = "error",
3432
ITEM = ".k-item",
3533
GROUP = ".k-group",
@@ -1417,14 +1415,10 @@ var __meta__ = { // jshint ignore:line
14171415
return;
14181416
}
14191417

1420-
if (target.hasClass(LINK) || target.hasClass(ICONEXPAND) || target.hasClass(ICONCOLLAPSE)) {
1421-
e.preventDefault();
1418+
if (target.is(":kendoFocusable") && !target.hasClass(LINK)) {
1419+
return;
14221420
}
14231421

1424-
if (target.is(":kendoFocusable") && !target.hasClass(LINK)) {
1425-
return;
1426-
}
1427-
14281422
var link = target.closest(LINKSELECTOR),
14291423
item = link.closest(ITEM);
14301424

@@ -1443,8 +1437,9 @@ var __meta__ = { // jshint ignore:line
14431437
isAnchor = href && (href.charAt(href.length - 1) == "#" || href.indexOf("#" + that.element[0].id + "-") != -1);
14441438
prevent = !!(isAnchor || contents.length);
14451439

1446-
if (contents.data("animating")) {
1447-
return prevent;
1440+
if (contents.data("animating") && prevent) {
1441+
e.preventDefault();
1442+
return;
14481443
}
14491444

14501445
if (that._triggerEvent(SELECT, item)) {
@@ -1456,8 +1451,9 @@ var __meta__ = { // jshint ignore:line
14561451
}
14571452

14581453
if (that.options.expandMode == SINGLE) {
1459-
if (that._collapseAllExpanded(item)) {
1460-
return prevent;
1454+
if (that._collapseAllExpanded(item) && prevent) {
1455+
e.preventDefault();
1456+
return;
14611457
}
14621458
}
14631459

@@ -1469,7 +1465,9 @@ var __meta__ = { // jshint ignore:line
14691465
}
14701466
}
14711467

1472-
return prevent;
1468+
if (prevent) {
1469+
e.preventDefault();
1470+
}
14731471
},
14741472
_hasChildItems: function (item) {
14751473
return (item.items && item.items.length > 0) || item.hasChildren;

0 commit comments

Comments
 (0)