Skip to content

Commit 78c00f4

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent ba15af7 commit 78c00f4

File tree

7 files changed

+291
-278
lines changed

7 files changed

+291
-278
lines changed

docs-aspnet/html-helpers/editors/timepicker/component-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Component Types
33
page_title: Telerik UI TimePicker Documentation | TimePicker Component Types | Telerik UI
44
description: "Get started with the jQuery TimePicker by Telerik UI and learn how to enable the modern component type."
5-
slug: htmlhelpers_componenttype_datetimepicker_aspnetcore
5+
slug: htmlhelpers_componenttype_timepicker_aspnetcore
66
position: 5
77
---
88

docs/controls/scheduling/calendar/component-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Calendar Component Types
33
page_title: jQuery DatePicker Documentation | Calendar Component Types | Kendo UI
44
description: "Get started with the jQuery DatePicker by Kendo UI and learn how to enable the modern component type."
5-
slug: componenttypes_datepicker
5+
slug: componenttypes_calendar
66
position: 8
77
---
88

src/kendo.badge.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ var __meta__ = {// jshint ignore:line
8282
if (options.badgeStyle === 'solid' && typeof options.look === 'string' && options.look !== '') {
8383
options.badgeStyle = options.look;
8484
}
85+
86+
if (options.position === 'inline' && typeof options.overlay === 'boolean' && options.overlay === true) {
87+
options.position = "top end";
88+
}
8589
},
8690

8791
_content: function() {

src/kendo.tabstrip.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,8 +1097,8 @@ var __meta__ = { // jshint ignore:line
10971097
if (tabGroupScrollWidth > wrapperOffsetWidth && !that._scrollableModeActive) {
10981098
that._nowScrollingTabs = false;
10991099
that._isRtl = kendo.support.isRtl(that.element);
1100-
var mouseDown = kendo.support.mobileOS ? "touchstart" : "mousedown";
1101-
var mouseUp = kendo.support.mobileOS ? "touchend" : "mouseup";
1100+
var mouseDown = kendo.support.touch ? "touchstart" : "mousedown";
1101+
var mouseUp = kendo.support.touch ? "touchend" : "mouseup";
11021102
var browser = kendo.support.browser;
11031103
var isRtlScrollDirection = that._isRtl && !browser.msie && !browser.edge;
11041104

styles/web/Default/badge/_layout.less

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ a.k-badge:hover,
125125
each( @badge-positions, {
126126
@placement: @key;
127127
@translate: @value;
128-
@infix: if( @placement = "edge", "", "-@{placement}");
128+
@infix: if( @placement = edge, ~"", ~"-@{placement}");
129129

130130
.k-badge@{infix} {
131131
&-top-start {
@@ -134,7 +134,7 @@ each( @badge-positions, {
134134
top: 0;
135135
left: 0;
136136
& when not (@translate = null) {
137-
transform: translate( -1% * @translate, -1% * @translate );
137+
transform: translate( (-1% * @translate), (-1% * @translate) );
138138
}
139139
}
140140
&-top-end {
@@ -143,7 +143,7 @@ each( @badge-positions, {
143143
top: 0;
144144
right: 0;
145145
& when not (@translate = null) {
146-
transform: translate( 1% * @translate, -1% * @translate );
146+
transform: translate( (1% * @translate), (-1% * @translate) );
147147
}
148148
}
149149
&-bottom-start {
@@ -152,7 +152,7 @@ each( @badge-positions, {
152152
bottom: 0;
153153
left: 0;
154154
& when not (@translate = null) {
155-
transform: translate( -1% * @translate, 1% * @translate );
155+
transform: translate( (-1% * @translate), (1% * @translate) );
156156
}
157157
}
158158
&-bottom-end {
@@ -161,7 +161,7 @@ each( @badge-positions, {
161161
bottom: 0;
162162
right: 0;
163163
& when not (@translate = null) {
164-
transform: translate( 1% * @translate, 1% * @translate );
164+
transform: translate( (1% * @translate), (1% * @translate) );
165165
}
166166
}
167167
}
@@ -172,28 +172,28 @@ each( @badge-positions, {
172172
left: auto;
173173
right: 0;
174174
& when not (@translate = null) {
175-
transform: translate( 1% * @translate, -1% * @translate );
175+
transform: translate( (1% * @translate), (-1% * @translate) );
176176
}
177177
}
178178
&-top-end {
179179
right: auto;
180180
left: 0;
181181
& when not (@translate = null) {
182-
transform: translate( -1% * @translate, -1% * @translate );
182+
transform: translate( (-1% * @translate), (-1% * @translate) );
183183
}
184184
}
185185
&-bottom-start {
186186
left: auto;
187187
right: 0;
188188
& when not (@translate = null) {
189-
transform: translate( 1% * @translate, 1% * @translate );
189+
transform: translate( (1% * @translate), (1% * @translate) );
190190
}
191191
}
192192
&-bottom-end {
193193
right: auto;
194194
left: 0;
195195
& when not (@translate = null) {
196-
transform: translate( -1% * @translate, 1% * @translate );
196+
transform: translate( (-1% * @translate), (1% * @translate) );
197197
}
198198
}
199199
}

tests/badge/deprecated.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@
6464
});
6565
// #region
6666

67+
68+
// #region overlay
69+
test('badge.options.overlay maps to badge.options.position', function() {
70+
badge = new Badge(span, { overlay: true });
71+
72+
assert.equal(badge.element.hasClass('k-badge-top-end'), true);
73+
});
74+
// #region
75+
6776
});
6877

6978
})();

0 commit comments

Comments
 (0)