Skip to content

Commit 03aefa4

Browse files
author
User Jenkins
committed
Sync with Kendo UI Professional
1 parent 6c3d4cb commit 03aefa4

File tree

6 files changed

+77
-65
lines changed

6 files changed

+77
-65
lines changed

docs/framework/drawing/pdf-output/page-templates.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ This template will be inserted into each page before producing the output. You c
9696
// NOTE: Only required if the Kendo UI stylesheets are loaded
9797
// from a different origin, e.g. cdn.kendostatic.com
9898
kendo.pdf.defineFont({
99-
"DejaVu Sans" : "https://kendo.cdn.telerik.com{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans.ttf",
100-
"DejaVu Sans|Bold" : "https://kendo.cdn.telerik.com{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans-Bold.ttf",
101-
"DejaVu Sans|Bold|Italic" : "https://kendo.cdn.telerik.com{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans-Oblique.ttf",
102-
"DejaVu Sans|Italic" : "https://kendo.cdn.telerik.com{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans-Oblique.ttf"
99+
"DejaVu Sans" : "https://kendo.cdn.telerik.com/{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans.ttf",
100+
"DejaVu Sans|Bold" : "https://kendo.cdn.telerik.com/{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans-Bold.ttf",
101+
"DejaVu Sans|Bold|Italic" : "https://kendo.cdn.telerik.com/{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans-Oblique.ttf",
102+
"DejaVu Sans|Italic" : "https://kendo.cdn.telerik.com/{{ site.cdnVersion }}/styles/fonts/DejaVu/DejaVuSans-Oblique.ttf"
103103
});
104104
</script>
105105
```

src/kendo.datepicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ var __meta__ = { // jshint ignore:line
453453
element[0].removeAttribute(READONLY);
454454
}
455455
element.attr(ARIA_DISABLED, false)
456-
.attr(ARIA_DISABLED, false)
456+
.attr(ARIA_READONLY, false)
457457
.on("keydown" + ns, proxy(that._keydown, that))
458458
.on("focusout" + ns, proxy(that._blur, that))
459459
.on("focus" + ns, function() {

src/kendo.multiselect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,14 +631,14 @@ var __meta__ = { // jshint ignore:line
631631
that._renderNoData();
632632
that._toggleNoData(!data.length);
633633
that._resizePopup();
634-
that._updateItemFocus();
635634

636635
if (that._open) {
637636
that._open = false;
638637
that.toggle(that._allowOpening());
639638
}
640639

641640
that.popup.position();
641+
that._updateItemFocus();
642642

643643
if (that._touchScroller) {
644644
that._touchScroller.reset();

styles/web/common/inputs.less

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,6 @@ span.k-dropdowntree {
244244
right: 3px;
245245
}
246246

247-
// prevent missing bottom border at some zoom levels
248-
span.k-textbox:after {
249-
content: "\a0";
250-
display: block;
251-
height: .4px;
252-
overflow: hidden;
253-
}
254-
255247
.k-autocomplete,
256248
.k-dropdown-wrap,
257249
.k-picker-wrap,
@@ -331,6 +323,7 @@ span.k-datetimepicker .k-select + .k-select {
331323
}
332324

333325
.k-textbox > input,
326+
.k-textbox > .k-input,
334327
.k-autocomplete .k-input,
335328
.k-multiselect-wrap .k-input,
336329
.k-picker-wrap .k-input,

tests/datepicker/aria.js

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,30 @@ it("DatePicker sets aria-hidden=true to the popup element", function() {
5454
assert.equal(instance.dateView.popup.element.attr("aria-hidden"), "true");
5555
});
5656

57-
it("DatePicker adds aria-disabled=false", function() {
58-
assert.equal(input.attr("aria-disabled"), "false");
59-
});
60-
6157
it("DatePicker sets aria-disabled=true", function() {
6258
instance.enable(false);
6359
assert.equal(input.attr("aria-disabled"), "true");
6460
});
6561

62+
it("DatePicker sets aria-disabled to false after state is changed", function() {
63+
instance.enable(false);
64+
instance.enable(true);
65+
66+
assert.equal(input.attr("aria-disabled"), "false");
67+
});
68+
69+
it("DatePicker sets aria-readonly=true", function() {
70+
instance.readonly(true);
71+
assert.equal(input.attr("aria-readonly"), "true");
72+
});
73+
74+
it("DatePicker sets aria-readonly to false after state is changed", function() {
75+
instance.readonly(true);
76+
instance.readonly(false);
77+
78+
assert.equal(input.attr("aria-readonly"), "false");
79+
});
80+
6681
it("DatePicker adds role to the toggle button", function() {
6782
assert.equal(instance._dateIcon.attr("role"), "button");
6883
});

typescript/kendo.all.d.ts

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,6 +2239,53 @@ declare namespace kendo.ui {
22392239
item?: JQuery;
22402240
}
22412241

2242+
class Badge extends kendo.ui.Widget {
2243+
2244+
static fn: Badge;
2245+
2246+
options: BadgeOptions;
2247+
2248+
2249+
element: JQuery;
2250+
wrapper: JQuery;
2251+
2252+
static extend(proto: Object): Badge;
2253+
2254+
constructor(element: Element, options?: BadgeOptions);
2255+
2256+
2257+
hide(): void;
2258+
icon(icon: string): void;
2259+
setOptions(options: any): void;
2260+
shape(shape: string): void;
2261+
show(): void;
2262+
text(text: string): void;
2263+
text(text: number): void;
2264+
themeColor(themeColor: string): void;
2265+
2266+
}
2267+
2268+
interface BadgeOptions {
2269+
name?: string;
2270+
align?: string;
2271+
cutoutBorder?: boolean;
2272+
fill?: string;
2273+
icon?: string;
2274+
max?: number;
2275+
position?: string;
2276+
shape?: string;
2277+
size?: string;
2278+
template?: string|Function;
2279+
text?: string|number;
2280+
themeColor?: string;
2281+
visible?: boolean;
2282+
}
2283+
interface BadgeEvent {
2284+
sender: Badge;
2285+
preventDefault: Function;
2286+
isDefaultPrevented(): boolean;
2287+
}
2288+
22422289
class BottomNavigation extends kendo.ui.Widget {
22432290

22442291
static fn: BottomNavigation;
@@ -22139,53 +22186,6 @@ declare namespace kendo.mobile.ui {
2213922186
context?: JQuery;
2214022187
}
2214122188

22142-
class Badge extends kendo.ui.Widget {
22143-
22144-
static fn: Badge;
22145-
22146-
options: BadgeOptions;
22147-
22148-
22149-
element: JQuery;
22150-
wrapper: JQuery;
22151-
22152-
static extend(proto: Object): Badge;
22153-
22154-
constructor(element: Element, options?: BadgeOptions);
22155-
22156-
22157-
hide(): void;
22158-
setOptions(options: any): void;
22159-
show(): void;
22160-
value(newValue: string): void;
22161-
value(newValue: number): void;
22162-
22163-
}
22164-
22165-
interface BadgeOptions {
22166-
name?: string;
22167-
appearance?: string;
22168-
look?: string;
22169-
template?: string|Function;
22170-
type?: string;
22171-
value?: string|number;
22172-
visible?: boolean;
22173-
change?(e: BadgeChangeEvent): void;
22174-
hide?(e: BadgeEvent): void;
22175-
show?(e: BadgeEvent): void;
22176-
}
22177-
interface BadgeEvent {
22178-
sender: Badge;
22179-
preventDefault: Function;
22180-
isDefaultPrevented(): boolean;
22181-
}
22182-
22183-
interface BadgeChangeEvent extends BadgeEvent {
22184-
oldValue?: string|number;
22185-
newValue?: string|number;
22186-
}
22187-
22188-
2218922189
class BackButton extends kendo.mobile.ui.Widget {
2219022190

2219122191
static fn: BackButton;
@@ -24328,6 +24328,10 @@ interface JQuery {
2432824328
kendoAutoComplete(options: kendo.ui.AutoCompleteOptions): JQuery;
2432924329
data(key: "kendoAutoComplete"): kendo.ui.AutoComplete;
2433024330

24331+
kendoBadge(): JQuery;
24332+
kendoBadge(options: kendo.ui.BadgeOptions): JQuery;
24333+
data(key: "kendoBadge"): kendo.ui.Badge;
24334+
2433124335
kendoBarcode(): JQuery;
2433224336
kendoBarcode(options: kendo.dataviz.ui.BarcodeOptions): JQuery;
2433324337
data(key: "kendoBarcode"): kendo.dataviz.ui.Barcode;

0 commit comments

Comments
 (0)